summaryrefslogtreecommitdiff
path: root/puppet/.mrconfig
AgeCommit message (Expand)Author
2015-11-06Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into developSilvio Rhatto
2014-10-01Merge commit '587f206824274d7d1cfcb1072ea8f818493bd317'Silvio Rhatto
2014-09-18Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet'Silvio Rhatto