Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 10:37:43 +0000 (11:37 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 10:37:43 +0000 (11:37 +0100)

Trivial merge