projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f56accd ffe0998)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 15 Nov 2012 19:07:53 +0000 (14:07 -0500)
committerMatthew Wild <mwild1@gmail.com>
Thu, 15 Nov 2012 19:07:53 +0000 (14:07 -0500)

Trivial merge