Summary of changes: 7d16a70... rebuild for new cogl (*) 2cb6ff7... fix merge (*) 1f78cda... 1.11.12 (*) (*) This commit already existed in another branch; no separate mail sent