Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 16 Jan 2012 17:49:30 +0000 (18:49 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 16 Jan 2012 17:49:30 +0000 (18:49 +0100)

Trivial merge