Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 6 Oct 2010 08:33:28 +0000 (10:33 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 6 Oct 2010 08:33:28 +0000 (10:33 +0200)

Trivial merge