projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3648d4a c56f42e)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 28 Mar 2013 13:51:03 +0000 (09:51 -0400)
committerMatthew Wild <mwild1@gmail.com>
Thu, 28 Mar 2013 13:51:03 +0000 (09:51 -0400)

Trivial merge