projects / hgr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e287a4 68357a0)
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)
Conflicts:
manifests/init.pp


Trivial merge
My "Hackers Gmail Replacement" puppet module - nomuch + radicale