projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f460b24 d3c808c)
Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:07:40 +0000 (15:07 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:07:40 +0000 (15:07 +0000)

Trivial merge