Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Nov 2012 14:42:00 +0000 (15:42 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Nov 2012 14:42:00 +0000 (15:42 +0100)

Trivial merge