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

Trivial merge