# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367413002 -3600
# Node ID b0288fe8226f3eacb85423d1020810bd65f2edd9
# Parent  e91db0aac408ac99cdd1e368a3b7e6b83cad328e# Parent  70a7ef4b6aaafc7dfccc1711382f86464757739e
Merge sasl branch