Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 12 Nov 2012 10:25:52 +0000 (11:25 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 12 Nov 2012 10:25:52 +0000 (11:25 +0100)

Trivial merge