]> gitweb.fluxo.info Git - puppet-ejabberd.git/commit
Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberd master
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 21:48:32 +0000 (19:48 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 21:48:32 +0000 (19:48 -0200)
commitf02b06b19f88ca10a6ee8d1e93d7128445f2501b
treeced2e18a130d9d69b7c897de6f4e8b7db821806b
parentae70891c89c9e6f0c9a77e75dd64905a25ebc221
parent199551906b8eca94e23c16b5619c206488cc112a
Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberd

Conflicts:
manifests/base.pp
manifests/base.pp