Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Sep 2010 15:40:36 +0000 (17:40 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 20 Sep 2010 15:40:36 +0000 (17:40 +0200)

Trivial merge