From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 8 May 2015 20:20:46 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=039c63890c58b1d7bd637202fa5f86ff52b49ec1;p=puppet-common.git

Merge branch 'master' into 'master'

Fixes #1 - Update README to include information for upgrading to the new version

See merge request !2
---

039c63890c58b1d7bd637202fa5f86ff52b49ec1