projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8db9b2e 02487b9)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Mon, 29 Jun 2009 13:13:49 +0000 (14:13 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 29 Jun 2009 13:13:49 +0000 (14:13 +0100)

Trivial merge