Summary of changes: 8fb5b05... 1.11.2 (*) 2746a50... add cogl2 headers (*) 9bfe021... fix merge (*) 5c7cdad... 1.11.4 (*) 559db49... fix include files (*) (*) This commit already existed in another branch; no separate mail sent