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

[Robert Scheck]

commit 966c388bd3ddb2a954cf85007ab68fe49e5b8549
Merge: f302bc3 2bc7ee4
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 14 12:11:46 2013 +0100

    Merge remote branch 'origin/master' into el5

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