projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5881cac ce569ba)
Merge
authorMatthew Wild <mwild1@gmail.com>
Tue, 4 Dec 2012 20:11:41 +0000 (20:11 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 4 Dec 2012 20:11:41 +0000 (20:11 +0000)

Trivial merge