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

Trivial merge