projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bed0134 defbb45)
Merge with Tobias's SASL redesign branch
authorMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 17:39:23 +0000 (17:39 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 17:39:23 +0000 (17:39 +0000)

Trivial merge