Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 28 Dec 2010 13:18:44 +0000 (14:18 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 28 Dec 2010 13:18:44 +0000 (14:18 +0100)

Trivial merge