Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 17:28:51 +0000 (18:28 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 17:28:51 +0000 (18:28 +0100)
commit9b7c4fb29b4d7ce6714e90346a554a811f54b125
treeb920db92f05c7e3865e57de6ff4d49da95710473
parentae1a87d3a850afd7865e453d9fe900581a42e5ff
parent5c5d0641f55504c2e9ed860633caba14d313981d
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp