Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 16:13:33 +0000 (17:13 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 16:13:33 +0000 (17:13 +0100)
commit7edc9f8c5eeec5fd24ccd709efa62f928ab66350
treeaaa14623b3c3ca8af125322dfd858788d2d61256
parentbc88a0d19d2891ea36830ca2dae796975c369d7b
parenteca0862f8bcc69d22d94c41cc9076a008c77056d
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp