Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Dec 2010 12:17:22 +0000 (13:17 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Dec 2010 12:17:22 +0000 (13:17 +0100)

Trivial merge