Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jun 2011 12:12:05 +0000 (14:12 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jun 2011 12:12:05 +0000 (14:12 +0200)

Trivial merge