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

Trivial merge