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)
commitbbc941245dac37083f0b46e115191c59bfbf95eb
treec1404e19986611c484554a219a5444066d14cd2c
parentb37418157be5a45864b120d966d1f562d1332089
parentb26159b149cd54a06bbf538a5f1bd11b9c31c5d2
merge: branch 'lr/virtual-parent-bgo762731'

https://bugzilla.gnome.org/show_bug.cgi?id=762731