[Merge] lp:~michael-sheldon/ubuntu/utopic/maliit-framework/sync-with-upstream into lp:ubuntu/maliit-framework

[Ricardo Salveti]

Rejected as we ended up rebasing the package with latest upstream.
-- 
https://code.launchpad.net/~michael-sheldon/ubuntu/utopic/maliit-framework/sync-with-upstream/+merge/231181
Your team Ubuntu branches is requested to review the proposed merge of lp:~michael-sheldon/ubuntu/utopic/maliit-framework/sync-with-upstream into lp:ubuntu/maliit-framework.