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)
commit5a1000e8e61beb0c9ecf56ad9342d5b7031f9b49
treed131c25f447df635294ec1b624726ee21ff0e04e
parent9e59c7ae139d34932454cd6e3921c70c1b978fd9
parent2b0ce3a7860d05433b900e4713d1c65e40f62422
Merge sasl branch