Merge branch 'master' of gitorious.org:colord/colord-kde
author Daniel Nicoletti
()
committer Daniel Nicoletti
()
commit 62f9a4b3d68c85a84777fbf16c1c7976e6d391ef
tree 62def65d631f39f10054db4728755146fb8b507d
parent 9d4bb769b87b561230719f62c74c8002668e1df1
parent 72d00d646f24982d26c80749f10eb54f8e051357
Merge branch 'master' of gitorious.org:colord/colord-kde
colord-kded/ColorD.cpp