[packages/cogl: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/cogl

[qboosh]

commit 21245f53a480aaa28969d1626db5390d72928693
Merge: ce06145 b77f862
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 1 18:33:34 2015 +0100

    Merge branch 'master' of git://git.pld-linux.org/packages/cogl

---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cogl.git/commitdiff/21245f53a480aaa28969d1626db5390d72928693