]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Wed, 16 Dec 2015 12:01:12 +0000 (13:01 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Wed, 16 Dec 2015 12:01:12 +0000 (13:01 +0100)
commit5ffdfdd95d0ef53fa27e00a704ab1d30f74b5c1c
treebb166c4b626a663a953dec77be716df193839c58
parent08b0530164bd0907536f3c0a00467908451cea20
parentb5cc4a3a7d59136022bcfeca4dda7fd11344d4ca
Merge branch 'master' of github.com:processone/ejabberd