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

Trivial merge