Merge branch 'sasl'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 7 Dec 2010 11:54:33 +0000 (11:54 +0000)
commit6c5839c976407292715daf22cdddf6aca469fa75
tree70b451c081480d4fd40bdb3ecbefce12290e1087
parent9d40a77fae9175d7932c3af0e95cbdf1cfde433b
parenteb3f7d2fb30be62b801b6086143fb476b5368b5d
Merge branch 'sasl'