Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 13 May 2011 11:27:08 +0000 (13:27 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 13 May 2011 11:27:08 +0000 (13:27 +0200)

Trivial merge