Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 15:57:11 +0000 (16:57 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 15:57:11 +0000 (16:57 +0100)

Trivial merge