projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06193d1 6740b1f)
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)
committerMickael Remond <mremond@process-one.net>
Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.