update README regarding munin graphs
Merge remote-tracking branch 'shared/master' into riseup

Conflicts:
	README
Merge branch 'leap' into riseup
fix $apache::no_default_site variable
Merge branch 'master' of labs.riseup.net:module_apache into riseup
remove safe_mode flag from defaults under Debian (removed from PHP 5.4 which is in wheezy)
append  to standard paths instead of override
pass additional open_basedir paths in $php_options hash instead
fix merge conflict snafu introduced by:
115691c87bad3f5863f088e73603133b67c9f828

this fixes the incorrectly nested case statement, and brings back the
lost 'config file as link' changes
Merge branch 'riseup'
Merge branch 'master' of ssh://git.cmaisonneuve.qc.ca/srv/git/public/puppet/module-apache
make it possible that domainalias can be an array
an initial https connection might still end up as http on the backend. in that case we don't want to redirect
cleanup identation of if then else, especially for the produced file
more identation fixing
only forward on https
fix identation
remove that extra line
include fcgi config also on http although they might get redirected, because requests might still hit the backend plain
linting