projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0470967 a41d3db)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Sat, 4 Oct 2008 18:24:43 +0000 (19:24 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 4 Oct 2008 18:24:43 +0000 (19:24 +0100)

Trivial merge