projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a98b542
ab7d97d
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Mon, 22 Feb 2016 14:24:20 +0000
(15:24 +0100)
committer
Kim Alvefur
<zash@zash.se>
Mon, 22 Feb 2016 14:24:20 +0000
(15:24 +0100)
Trivial merge