Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Sep 2009 09:11:05 +0000 (11:11 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Sep 2009 09:11:05 +0000 (11:11 +0200)

Trivial merge