Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 30 Dec 2010 15:59:24 +0000 (16:59 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 30 Dec 2010 15:59:24 +0000 (16:59 +0100)

Trivial merge