From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Sun, 1 Jan 2012 17:55:26 +0000 (+0000)
Subject: Merge branch 'master', remote-tracking branch 'origin'
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=9a6dd5f4fae2333465e2c272c6258e56bd0130a3

Merge branch 'master', remote-tracking branch 'origin'
---

9a6dd5f4fae2333465e2c272c6258e56bd0130a3