From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 17 Jan 2013 21:48:32 +0000 (-0200)
Subject: Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberd
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f02b06b19f88ca10a6ee8d1e93d7128445f2501b;p=puppet-ejabberd.git

Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberd

Conflicts:
	manifests/base.pp
---

f02b06b19f88ca10a6ee8d1e93d7128445f2501b