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

Trivial merge