Merge branch 'master' of lx-office.linet-services.de:lx-office-erp release-2.6.2beta2
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 21 Jan 2011 14:43:56 +0000 (15:43 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 21 Jan 2011 14:43:56 +0000 (15:43 +0100)

Trivial merge