Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr master
authorJude N <jude@pwan.org>
Sun, 7 Sep 2014 16:32:22 +0000 (12:32 -0400)
committerJude N <jude@pwan.org>
Sun, 7 Sep 2014 16:32:22 +0000 (12:32 -0400)
commitcb5a94b9d4662bcb79cc59e23c9d3f1bbdb31cc5
tree71bcbae94c1fadc1eadb4716c18504fb1560f91c
parent8e287a49e4932a8a9b7b20b4372225a9d5ea5bd9
parent68357a041147937852c9c872c244d9bc732a2294
Merge branch 'master' of ssh://pwan.org/var/www/git/projects/hgr

Conflicts:
manifests/init.pp