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

Trivial merge