Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Aug 2010 09:51:24 +0000 (11:51 +0200)
committerMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Aug 2010 09:51:24 +0000 (11:51 +0200)

Trivial merge