Commit 5776d2f6 authored by Simon McVittie's avatar Simon McVittie

Merge remote-tracking branch 'origin/telepathy-gabble-0.18' into telepathy-gabble-0.18

parents 8eda2330 83939c69
wocky @ f58bf0bb
Subproject commit 0db9f32fd023fc728abf1780c26b957102c3292e
Subproject commit f58bf0bb331a736b4a282452f70ca409de3fac7d
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment