Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 28 Sep 2012 10:54:58 +0000 (12:54 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 28 Sep 2012 10:54:58 +0000 (12:54 +0200)

Trivial merge