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

Trivial merge