Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 4 Jan 2011 10:23:40 +0000 (11:23 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 4 Jan 2011 10:23:40 +0000 (11:23 +0100)

Trivial merge