tree 9d5d19813e1f2c0d0ab853c2897ca07738fb2542
parent 4a0bd6fdb2e9e3c589e1bdb282e7c2bfca8567b1
parent 25f453ef49004452ac4c201d59d9ce2ef52ffeee
author Albert Astals Cid <aacid@kde.org> 1370773073 +0200
committer Albert Astals Cid <aacid@kde.org> 1370773073 +0200

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

Conflicts:
	poppler/Catalog.cc
	qt4/src/poppler-private.h
	utils/HtmlOutputDev.cc