Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Jun 2011 15:54:35 +0000 (17:54 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Jun 2011 15:54:35 +0000 (17:54 +0200)

Trivial merge