Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/cyrus-sasl
authorLuke Howard <lukeh@padl.com>
Mon, 7 Jan 2013 08:00:00 +0000 (19:00 +1100)
committerLuke Howard <lukeh@padl.com>
Mon, 7 Jan 2013 08:00:00 +0000 (19:00 +1100)
commit4e5aeca620099816d64d0d6d6112e3bde315f713
tree5bd9fc50d8966178765011a596f215e4c7d775b0
parent0554fc0f1edc170541ec6c179395fb4e1ba356d1
parent598b9ccfe535732990e20b403e1561e1072d38c4
Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/cyrus-sasl

Conflicts:
plugins/gs2.c