]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Tue, 29 Mar 2016 09:21:58 +0000 (11:21 +0200)
committerMickael Remond <mremond@process-one.net>
Tue, 29 Mar 2016 09:21:58 +0000 (11:21 +0200)
commit221d8e0e5d2ccb112e7ade757763c0f1cd8926ec
tree3e16d80ea566fca2ac677a32ad4a1a6063d8f5b4
parent53d12caa56dfec564938bd59c34540960b9430b5
parentb0ef3e66a89a5bcf2383458d5d2af4af98568a95
Merge branch 'master' of github.com:processone/ejabberd