From: Travis Fields <cyberious@users.noreply.github.com>
Date: Tue, 4 Nov 2014 22:34:24 +0000 (-0800)
Subject: Merge pull request #217 from mhaskel/test
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4a9c69cb9d1242cdb53d1e758c07bdf79a8556cb;p=puppet-vcsrepo.git

Merge pull request #217 from mhaskel/test

Merge 1.2.x into master
---

4a9c69cb9d1242cdb53d1e758c07bdf79a8556cb