summaryrefslogtreecommitdiff
path: root/files/git@git.fluxo.info:puppet-ejabberd
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-17 19:48:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-17 19:48:32 -0200
commitf02b06b19f88ca10a6ee8d1e93d7128445f2501b (patch)
treeced2e18a130d9d69b7c897de6f4e8b7db821806b /files/git@git.fluxo.info:puppet-ejabberd
parentae70891c89c9e6f0c9a77e75dd64905a25ebc221 (diff)
parent199551906b8eca94e23c16b5619c206488cc112a (diff)
downloadpuppet-ejabberd-master.tar.gz
puppet-ejabberd-master.tar.bz2
Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberdHEADmaster
Conflicts: manifests/base.pp
Diffstat (limited to 'files/git@git.fluxo.info:puppet-ejabberd')
0 files changed, 0 insertions, 0 deletions