Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Tue, 3 Apr 2012 14:26:45 +0000 (16:26 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Tue, 3 Apr 2012 14:26:45 +0000 (16:26 +0200)

Trivial merge