Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 21 Jan 2011 12:24:15 +0000 (13:24 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 21 Jan 2011 12:24:15 +0000 (13:24 +0100)

Trivial merge