Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 7 Nov 2012 15:32:50 +0000 (16:32 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 7 Nov 2012 15:32:50 +0000 (16:32 +0100)

Trivial merge