Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 31 May 2011 09:01:24 +0000 (11:01 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 31 May 2011 09:01:24 +0000 (11:01 +0200)

Trivial merge