projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
3c9b44f
77f0e4b
)
Merge 0.10->trunk
author
Matthew Wild
<mwild1@gmail.com>
Thu, 4 Feb 2016 14:57:45 +0000
(14:57 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 4 Feb 2016 14:57:45 +0000
(14:57 +0000)
Trivial merge