Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 9 Feb 2011 16:46:56 +0000 (17:46 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 9 Feb 2011 16:46:56 +0000 (17:46 +0100)
commit7b4699d8d0b507359910ab47d91d5e3ab2c0b99a
tree35a945b10fa5bf04405a8a58b4e4c2deed1cc6be
parentc599fef2ec41c86b711406c9968772ef70b6cb3f
parent65b0e836c766dfbf937c8d81fb3361ae3cf5ed84
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp