projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c318b26 d2e2183)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 Apr 2009 23:12:32 +0000 (00:12 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 Apr 2009 23:12:32 +0000 (00:12 +0100)

Trivial merge