Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 7 Mar 2011 12:23:26 +0000 (13:23 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 7 Mar 2011 12:23:26 +0000 (13:23 +0100)

Trivial merge