projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
422fc2d
e00f55a
)
Merge 0.9->trunk
author
Matthew Wild
<mwild1@gmail.com>
Thu, 29 Nov 2012 02:38:24 +0000
(07:38 +0500)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 29 Nov 2012 02:38:24 +0000
(07:38 +0500)
Trivial merge