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

Trivial merge