aboutsummaryrefslogtreecommitdiff
path: root/puppet/.mrconfig
AgeCommit message (Expand)Author
2014-09-18Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet'Silvio Rhatto