Harry Danes 1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam ... Conflicts: manifests/resource/vhost.pp		2013-12-30 18:33:53 +01:00
..
location.pp	Fixed location containing '\', such as '~ \.php$'	2013-12-25 02:36:01 +04:00
mailhost.pp	Remove unused code in mailhost	2013-12-02 13:49:47 -05:00
upstream.pp	Add support for upstream_cfg_prepend	2013-04-22 10:03:09 +02:00
vhost.pp	Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam	2013-12-30 18:33:53 +01:00