Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 3 Apr 2012 14:32:25 +0000 (16:32 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 3 Apr 2012 14:32:25 +0000 (16:32 +0200)

Trivial merge