merge: branch 'lr/stable-privacy-rfc7217'
authorLubomir Rintel <lkundrak@v3.sk>
Mon, 2 Nov 2015 19:34:47 +0000 (20:34 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Mon, 2 Nov 2015 19:35:42 +0000 (20:35 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=755216


Trivial merge