[qpdf/el6: 2/2] Merge branch 'master' into el6

[Jiří Popelka]

commit 63474e30ef9f7173553b34dc3e543ef8b0d8af86
Merge: b3aa2e9 e6458e5
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 15 10:19:11 2014 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 qpdf.spec  |    6 ++++--
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---