projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74c88ee
91512af
)
Merge 0.10->trunk
author
Matthew Wild
<mwild1@gmail.com>
Sun, 22 May 2016 01:16:57 +0000
(
02:16
+0100)
committer
Matthew Wild
<mwild1@gmail.com>
Sun, 22 May 2016 01:16:57 +0000
(
02:16
+0100)
Trivial merge