From: Luke Howard <lukeh@padl.com>
Date: Mon, 7 Jan 2013 08:00:00 +0000 (+1100)
Subject: Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/cyrus-sasl
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=4e5aeca620099816d64d0d6d6112e3bde315f713

Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/cyrus-sasl

Conflicts:
	plugins/gs2.c
---

4e5aeca620099816d64d0d6d6112e3bde315f713