Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 2 Feb 2011 11:32:08 +0000 (12:32 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 2 Feb 2011 11:32:08 +0000 (12:32 +0100)

Trivial merge