projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 552a7b4 6a19623)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 01:01:19 +0000 (01:01 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 01:01:19 +0000 (01:01 +0000)

Trivial merge