projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d00edf c011776)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Wed, 26 Nov 2008 21:49:17 +0000 (21:49 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 26 Nov 2008 21:49:17 +0000 (21:49 +0000)

Trivial merge