From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 26 Jun 2014 20:34:45 +0000 (+0200)
Subject: Merge branch 'merge'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f8a2acffa34296894a03a4655a8b6a7fbd53e314;p=mirror%2Fdsa-puppet.git

Merge branch 'merge'

* merge:
  security_mirror: use /srv/ instead of deprecated /org/
---

f8a2acffa34296894a03a4655a8b6a7fbd53e314