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

[qboosh]

commit f8a0473b50c84a5e16caa1c11bc6d8e141e9635e
Merge: a78424e ab77123
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Feb 24 21:08:05 2015 +0100

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

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

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/colord.git/commitdiff/f8a0473b50c84a5e16caa1c11bc6d8e141e9635e