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

Trivial merge