]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorMickaël Rémond <mremond@process-one.net>
Tue, 3 Mar 2015 21:20:08 +0000 (22:20 +0100)
committerMickaël Rémond <mremond@process-one.net>
Tue, 3 Mar 2015 21:20:08 +0000 (22:20 +0100)
1  2 
src/mod_irc_connection.erl

Simple merge