Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@lx-office-hosting.de>
Tue, 4 Sep 2012 15:15:33 +0000 (17:15 +0200)
committerNiclas Zimmermann <niclas@lx-office-hosting.de>
Tue, 4 Sep 2012 15:15:33 +0000 (17:15 +0200)

Trivial merge