Merge proposals dependent on lp://staging/~vanvugt/compiz-plugins-main/fix-915236

lp://staging/~vanvugt/compiz-plugins-main/fix-915236 has no merge proposals.