Merge proposals dependent on lp://qastaging/~noskcaj/ubuntu/vivid/gnome-online-miners/grilo-dep

1. Vivid (15.04)
2. grilo-dep
3. Dependent merge proposals