Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
authorSven Donath <lxo@dexo.de>
Wed, 8 Sep 2010 10:44:57 +0000 (12:44 +0200)
committerSven Donath <lxo@dexo.de>
Wed, 8 Sep 2010 10:44:57 +0000 (12:44 +0200)

Trivial merge