projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
32cf6fa
5cf848f
)
Merge 0.9->trunk
author
Matthew Wild
<mwild1@gmail.com>
Thu, 13 Jun 2013 22:21:24 +0000
(23:21 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 13 Jun 2013 22:21:24 +0000
(23:21 +0100)
Trivial merge