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 10:42:32 +0000 (11:42 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 21 Jan 2011 10:42:32 +0000 (11:42 +0100)

Trivial merge