projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
bca35c2
a6168c7
)
Merge 0.10->trunk
master
author
Kim Alvefur
<zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000
(18:43 +0200)
committer
Kim Alvefur
<zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000
(18:43 +0200)
Trivial merge