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

Trivial merge