]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'merge'
authorPeter Palfrader <peter@palfrader.org>
Thu, 26 Jun 2014 20:34:45 +0000 (22:34 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 26 Jun 2014 20:34:45 +0000 (22:34 +0200)
commitf8a2acffa34296894a03a4655a8b6a7fbd53e314
tree68c3fdce53b75c5c2976ea2942a124231793fb4c
parent70f64e60018a139f491bd78513661fd47e25b3c1
parent467b8fc74ef4993b5d107da21e83fbeeabd3b892
Merge branch 'merge'

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