projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9ef646 3ace98c)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 22 Nov 2012 21:01:00 +0000 (21:01 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 22 Nov 2012 21:01:00 +0000 (21:01 +0000)

Trivial merge