]> gitweb.fluxo.info Git - puppet-backup.git/commitdiff
Merge branch 'master' into feature/autoload
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 5 Jan 2015 13:20:06 +0000 (11:20 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 5 Jan 2015 13:20:06 +0000 (11:20 -0200)

Trivial merge