Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 29 Dec 2010 10:21:10 +0000 (11:21 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 29 Dec 2010 10:21:10 +0000 (11:21 +0100)

Trivial merge