Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 10:58:16 +0000 (11:58 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 10:58:16 +0000 (11:58 +0100)

Trivial merge