Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Thu, 12 Jan 2012 08:26:47 +0000 (09:26 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Thu, 12 Jan 2012 08:26:47 +0000 (09:26 +0100)

Trivial merge