projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
986fa60
a14deb1
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000
(
00:37
+0200)
committer
Kim Alvefur
<zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000
(
00:37
+0200)
Trivial merge