Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 17:28:51 +0000 (18:28 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 17:28:51 +0000 (18:28 +0100)

Trivial merge