Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Thu, 12 Jan 2012 08:26:47 +0000 (09:26 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Thu, 12 Jan 2012 08:26:47 +0000 (09:26 +0100)
commit15f021a67aa7e26458a3fbac8efe89ef9c0b0657
treedbb8d1f4e3e1f8976ee4f48cbb4048c653ea77b7
parentf8309cb7bc2507c19e17ec59c6c66dd7f49ea351
parent6caa57e2e994c8f99c209ce18379305eb01d1676
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp