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

Trivial merge