projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a13378 ce53cc7)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 22 Jan 2012 22:55:49 +0000 (22:55 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 22 Jan 2012 22:55:49 +0000 (22:55 +0000)

Trivial merge