tree fdabf97a5c31f702ceff4dfa1642744693137a1b
parent 40efa72987ebf62cbf2c761c10a209e2e6be612e
parent d254174e08146115ad04ac1f1bf82bb26e56c684
author Albert Astals Cid <aacid@kde.org> 1352417899 +0100
committer Albert Astals Cid <aacid@kde.org> 1352417899 +0100

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

Conflicts:
	poppler/Form.cc