Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 9 Nov 2011 09:35:17 +0000 (10:35 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 9 Nov 2011 09:35:17 +0000 (10:35 +0100)

Trivial merge