Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 2 May 2011 10:37:36 +0000 (12:37 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 2 May 2011 10:37:36 +0000 (12:37 +0200)

Trivial merge