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

Trivial merge