Merge proposals dependent on lp:~roland-hedberg/pysaml2/0.2.1

lp:~roland-hedberg/pysaml2/0.2.1 has no merge proposals.