Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 09:59:09 +0000 (10:59 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 09:59:09 +0000 (10:59 +0100)

Trivial merge