Merge branch 'master' of ssh://git.planet-lab.org/git/build

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index ecf78e5..5ec2c8a 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -41,7 +41,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-1
+ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 8623504..12f3b9f 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -36,7 +36,7 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-1
+ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-11