Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 20 Nov 2012 13:11:30 +0000 (14:11 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 20 Nov 2012 13:11:30 +0000 (14:11 +0100)

Trivial merge