From: Jude N <jude@pwan.org>
Date: Sun, 7 Sep 2014 16:32:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr
X-Git-Url: https://pwan.org/git/?a=commitdiff_plain;h=cb5a94b9d4662bcb79cc59e23c9d3f1bbdb31cc5;p=hgr.git

Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr

Conflicts:
	manifests/init.pp
---

cb5a94b9d4662bcb79cc59e23c9d3f1bbdb31cc5