tree e296eb9e067384655a7a78849718634fbf7b9449
parent 61f665885daeb0009ecac2cc85188f23d6addb60
parent 56044ef482c26f10a8a1371dace049c144659dc7
author Albert Astals Cid <aacid@kde.org> 1369606812 +0200
committer Albert Astals Cid <aacid@kde.org> 1369606812 +0200

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