Merge remote-tracking branch 'githubmirror/master'
authormh <mh@immerda.ch>
Mon, 27 May 2013 21:04:05 +0000 (23:04 +0200)
committermh <mh@immerda.ch>
Mon, 27 May 2013 21:04:57 +0000 (23:04 +0200)
commiteb8089cd99b9aacdb6af9da4704dce3a3ef7d299
tree3235ff51e115e189e401817b326c374381001d06
parenta5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5
parent35107f366832d4084ccebc0b00e77d7866f29aed
Merge remote-tracking branch 'githubmirror/master'

Integrate the changes in other changes I already merged.

Conflicts:
README
manifests/host/cgi.pp
manifests/host.pp
manifests/host/cgi.pp