Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 4 Sep 2012 12:28:51 +0000 (14:28 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 4 Sep 2012 12:28:51 +0000 (14:28 +0200)

Trivial merge