Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 29 Jun 2012 10:36:32 +0000 (12:36 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 29 Jun 2012 10:36:32 +0000 (12:36 +0200)

Trivial merge