Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 31 Aug 2012 11:40:53 +0000 (13:40 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 31 Aug 2012 11:40:53 +0000 (13:40 +0200)

Trivial merge