projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e59c7a 2b0ce3a)
Merge sasl branch
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:56:42 +0000 (13:56 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:56:42 +0000 (13:56 +0100)

Trivial merge