Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jul 2011 10:57:28 +0000 (12:57 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 22 Jul 2011 10:57:28 +0000 (12:57 +0200)

Trivial merge