Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 28 Nov 2011 15:46:37 +0000 (16:46 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 28 Nov 2011 15:46:37 +0000 (16:46 +0100)

Trivial merge