]> mj.ucw.cz Git - pciids.git/commit
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 13 Oct 2008 20:17:53 +0000 (22:17 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 13 Oct 2008 20:17:53 +0000 (22:17 +0200)
commit8b50236fc38dcfd1d084bad5e2689162f3e247b1
tree6be7100a3996c9c165c645af3dc6b809b63de787
parent6891a2e119bb3f1d3e60d48dcd883765c842a0b1
parentf38326fc4c859f2fdd4ee708ec377a20a12e50e5
Merge branch 'master' of /home/vorner/pciids

Conflicts:

cf/config
cf/config