]> mj.ucw.cz Git - pciids.git/commit
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 8 Sep 2008 22:02:37 +0000 (00:02 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 8 Sep 2008 22:02:37 +0000 (00:02 +0200)
commit27df61715a6a743b97c2f71fdd50a1b4aa63107d
tree222a5fe9dcb3d4701371b26204a6648d82ce03b1
parentd0676dde535505cc68e9387a28460266bd396501
parent1a41160ce590d689aacdcb815790329dd4aecf10
Merge branch 'master' of /home/vorner/pciids

Conflicts:

PciIds/Startup.pm
PciIds/Startup.pm