projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
ac789a4
43dca33
)
Merge 0.10->trunk
author
Matthew Wild
<mwild1@gmail.com>
Sun, 22 May 2016 19:07:20 +0000
(20:07 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Sun, 22 May 2016 19:07:20 +0000
(20:07 +0100)
Trivial merge