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

Trivial merge