projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bc879d
c0d4f74
)
Merge 0.8->trunk
author
Matthew Wild
<mwild1@gmail.com>
Fri, 7 Jan 2011 05:11:17 +0000
(
05:11
+0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 7 Jan 2011 05:11:17 +0000
(
05:11
+0000)
Trivial merge