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

Trivial merge