projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8244f4a 69fc53c)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Wed, 8 Apr 2009 19:19:55 +0000 (20:19 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 8 Apr 2009 19:19:55 +0000 (20:19 +0100)

Trivial merge