projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
8f9244c
22f9bfc
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000
(21:22 +0100)
committer
Kim Alvefur
<zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000
(21:22 +0100)
Trivial merge