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

Trivial merge