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

Trivial merge