Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jun 2012 08:30:07 +0000 (10:30 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jun 2012 08:30:07 +0000 (10:30 +0200)

Trivial merge