Merge branch 'installationscheck-devel-module-2170'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 6 Jan 2014 18:05:32 +0000 (19:05 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 6 Jan 2014 18:05:32 +0000 (19:05 +0100)

Trivial merge