Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Aug 2012 13:01:39 +0000 (15:01 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Aug 2012 13:01:39 +0000 (15:01 +0200)

Trivial merge