Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 22 Aug 2012 16:24:17 +0000 (18:24 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 22 Aug 2012 16:24:17 +0000 (18:24 +0200)

Trivial merge