Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorThomas Heck <theck@linet-services.de>
Tue, 28 Aug 2012 10:38:35 +0000 (12:38 +0200)
committerThomas Heck <theck@linet-services.de>
Tue, 28 Aug 2012 10:38:35 +0000 (12:38 +0200)

Trivial merge