Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Dec 2010 16:32:10 +0000 (17:32 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Dec 2010 16:32:10 +0000 (17:32 +0100)

Trivial merge