projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80878c3 fc12470)
Merge with Rob
authorMatthew Wild <mwild1@gmail.com>
Sun, 3 Jan 2010 15:17:51 +0000 (15:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 3 Jan 2010 15:17:51 +0000 (15:17 +0000)

Trivial merge