Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 13 Jan 2011 14:17:16 +0000 (15:17 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 13 Jan 2011 14:17:16 +0000 (15:17 +0100)

Trivial merge