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

Trivial merge