Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 3 Jan 2011 17:35:03 +0000 (18:35 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 3 Jan 2011 17:35:03 +0000 (18:35 +0100)

Trivial merge