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

Trivial merge