Code Review / puppet-modules / puppetlabs-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: df8f80a 6540b7b)
Merge pull request #360 from mhaskel/test
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 15 Sep 2014 21:27:27 +0000 (14:27 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 15 Sep 2014 21:27:27 +0000 (14:27 -0700)
Merge 1.6.x into master


Trivial merge