Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 10 Jan 2012 10:57:29 +0000 (11:57 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 10 Jan 2012 10:57:29 +0000 (11:57 +0100)

Trivial merge