merge: branch 'lr/virtual-parent-bgo762731'
authorLubomir Rintel <lkundrak@v3.sk>
Sat, 26 Mar 2016 10:31:45 +0000 (11:31 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Sat, 26 Mar 2016 10:31:45 +0000 (11:31 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=762731


Trivial merge