Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 09:52:06 +0000 (10:52 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 09:52:06 +0000 (10:52 +0100)
commitc29f804f6abc440789b0c89ff4d7fc171fcf5bda
tree9236636537387580488183ef519677689c8c2c42
parentb43401b0d8dfe0372cc3f2c9a0496089d19fb35f
parente0c425bf0dcac2eb02c817b6670b260e60035674
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp