Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 10 Dec 2010 08:14:53 +0000 (09:14 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 10 Dec 2010 08:14:53 +0000 (09:14 +0100)

Trivial merge