From: Luke Howard <lukeh@padl.com>
Date: Fri, 24 Sep 2010 15:55:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lhoward@moonshot.suchdamage.org:822/srv/git/moonshot
X-Git-Tag: vm/20110310~226
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=646a981cdd5c439b4b4fa5dde8f742a1a2a05b43

Merge branch 'master' of ssh://lhoward@moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
	cyrus-sasl
---

646a981cdd5c439b4b4fa5dde8f742a1a2a05b43