Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 2 Sep 2011 14:05:47 +0000 (16:05 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 2 Sep 2011 14:05:47 +0000 (16:05 +0200)

Trivial merge