Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 10 Jan 2013 15:36:54 +0000 (16:36 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 10 Jan 2013 15:36:54 +0000 (16:36 +0100)

Trivial merge