Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 11 Oct 2012 12:44:49 +0000 (14:44 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 11 Oct 2012 12:44:49 +0000 (14:44 +0200)

Trivial merge