]> gitweb.fluxo.info Git - puppet-nginx.git/commitdiff
Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-nginx
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Feb 2010 22:40:24 +0000 (20:40 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Feb 2010 22:40:24 +0000 (20:40 -0200)

Trivial merge