projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5305491 b461326)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Thu, 27 Nov 2008 23:36:49 +0000 (23:36 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 27 Nov 2008 23:36:49 +0000 (23:36 +0000)

Trivial merge