projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb0e35e 9dca2b5)
Merge
authorMatthew Wild <mwild1@gmail.com>
Sun, 12 Jan 2014 11:19:55 +0000 (06:19 -0500)
committerMatthew Wild <mwild1@gmail.com>
Sun, 12 Jan 2014 11:19:55 +0000 (06:19 -0500)

Trivial merge