projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4dfa1c 1c48b1b)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 12 Mar 2013 12:30:35 +0000 (12:30 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 12 Mar 2013 12:30:35 +0000 (12:30 +0000)

Trivial merge