2 Commits

Author	SHA1	Message	Date
Juergen Daubert	d0ca97dc99	Merge branch '3.2' into 3.3 ... Conflicts: poppler-glib/.md5sum poppler-qt4/.md5sum poppler/.md5sum python-pyparsing/Pkgfile python-setuptools/Pkgfile xsane/Pkgfile	2017-02-17 13:09:24 +01:00
Danny Rawlins	8bb696fd37	pyparsing -> python-pyparsing	2017-02-05 15:14:03 +11:00