Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 May 2011 13:26:14 +0000 (15:26 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 May 2011 13:26:14 +0000 (15:26 +0200)

Trivial merge