Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 20 Sep 2010 13:27:53 +0000 (15:27 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 20 Sep 2010 13:27:53 +0000 (15:27 +0200)

Trivial merge