Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 3 Mar 2010 16:36:49 +0000 (17:36 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 3 Mar 2010 16:36:49 +0000 (17:36 +0100)
commit0d295843fa8bdcc543e9c68d8b6de056fb4f092e
tree6b239a1a4810475032ef68f1985904b7b36e23b1
parent400e3ab01e7f8c3c1910921c086c3909529778d5
parent0986ccab89259b93753b5a778e1ad16ffe8cb251
Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp