tree 858889fc4b9133633a385b66390a65a4524f1ba0
parent 998a9e7c982a72b0e931304b719de40f30094d12
parent 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12
author Albert Astals Cid <aacid@kde.org> 1368470404 +0200
committer Albert Astals Cid <aacid@kde.org> 1368470404 +0200

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