projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a57cc3f a08558e)
Merge (for some reason)
authorMatthew Wild <mwild1@gmail.com>
Tue, 4 Nov 2008 01:26:56 +0000 (01:26 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 4 Nov 2008 01:26:56 +0000 (01:26 +0000)

Trivial merge