Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Jun 2011 08:46:14 +0000 (10:46 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Jun 2011 08:46:14 +0000 (10:46 +0200)

Trivial merge