]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Mon, 5 May 2014 16:42:49 +0000 (18:42 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Mon, 5 May 2014 16:42:49 +0000 (18:42 +0200)
commit52f3acbdb115b6d12b896e9bea689f626b22113b
tree33fe90cc30b4670ed0ca23bd7b28e9f55b4a2394
parenta6244275b74365d2503b84e6f4754918cd6bf8f4
parent402dec835430bc8b50291337a139e8a74f51061f
Merge branch 'master' of github.com:processone/ejabberd