[libisofs/el5: 2/2] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 70441ad7d9ec31439907eef3e6887fe4461e05ac
Merge: 966c388 59bc8a2
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Mar 5 19:42:57 2014 +0100

    Merge remote branch 'origin/master' into el5

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