]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Tue, 29 Mar 2016 13:45:57 +0000 (15:45 +0200)
committerMickael Remond <mremond@process-one.net>
Tue, 29 Mar 2016 13:45:57 +0000 (15:45 +0200)
commit6d7891ed16b44b8c7b916d016337681faef3a8d3
treeffda8691e0bc1984711ddbeda427287a9502036d
parentc7c70ffa0a2757d2f18a32228f10e40bbc4a5ef6
parent78a44d80996ce2dbc8d6a773920f81c8cfc89e89
Merge branch 'master' of github.com:processone/ejabberd