Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 21 Jan 2011 11:06:06 +0000 (12:06 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 21 Jan 2011 11:06:06 +0000 (12:06 +0100)

Trivial merge