projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4be2f1c d1157fb)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 20 Mar 2010 14:17:51 +0000 (14:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 20 Mar 2010 14:17:51 +0000 (14:17 +0000)

Trivial merge