Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Mon, 7 Sep 2015 15:56:09 +0000 (17:56 +0200)
committerMickael Remond <mremond@process-one.net>
Mon, 7 Sep 2015 15:56:09 +0000 (17:56 +0200)
commit6b79bcdc9723260668eaa5651652274481a029ee
tree4f9fdf4a15ca7b88e3cff1f55b0dc76d772cd3a5
parent73932fb5074448935f646c24534eea1881352fd2
parent5a9f1b9bbab7ebd5c98722efd1d9b85ee74a0980
Merge branch 'master' of github.com:processone/ejabberd