Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 22 May 2012 06:26:02 +0000 (08:26 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 22 May 2012 06:26:02 +0000 (08:26 +0200)

Trivial merge