tree f2b0d3fe86526b86cf54a46ed3ba042c2d1e4013
parent 5e73cb059e27f68b329513de609d52e84d73f8af
parent 73d09cd55f3bd307450c2dd095e039ea39c69cea
author Albert Astals Cid <aacid@kde.org> 1368466226 +0200
committer Albert Astals Cid <aacid@kde.org> 1368466226 +0200

Merge remote-tracking branch 'origin/poppler-0.22'

Conflicts:
	splash/Splash.cc