]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge remote-tracking branch 'immerda/master'
authorMicah Anderson <micah@riseup.net>
Sat, 1 Nov 2014 14:30:37 +0000 (10:30 -0400)
committerMicah Anderson <micah@riseup.net>
Sat, 1 Nov 2014 14:30:37 +0000 (10:30 -0400)

Trivial merge