[libisofs/f19: 4/4] Merge remote branch 'origin/master' into f19

[Robert Scheck]

commit cb0187fa421035ed9880a02e7835a3484695e50f
Merge: 1977465 b76827d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jun 29 17:25:07 2014 +0200

    Merge remote branch 'origin/master' into f19

 libisofs.spec |    8 +++++++-
 sources       |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---