]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)
committerMickael Remond <mremond@process-one.net>
Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)
commita85a8dff455932daadcc55a9bc4d4878b77e0b9f
treeb384188d219458d9d5721e030fbc7e3e0474d164
parent06193d18b89c0d8a48dda757b7e2b68dd9ce4eda
parent6740b1f0e1e96fb7ee04fd4046c180c35c9f370d
Merge branch 'master' of github.com:processone/ejabberd