]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Mon, 25 Jan 2016 22:28:33 +0000 (23:28 +0100)
committerMickael Remond <mremond@process-one.net>
Mon, 25 Jan 2016 22:28:33 +0000 (23:28 +0100)
commitfc2d5da1121d7d5abf650174600c3bad719cccd4
treea16bc064cf01bd328fd3f1661b7e97327c9c8b1f
parent28569d62091a54d88f184c39385ea25890ae43e2
parent22696e83886d9a2f2217af4af09959aaf5a25f47
Merge branch 'master' of github.com:processone/ejabberd