[squashfs-tools/f19: 2/2] Merge branch 'f20' into f19

[Bruno Wolff III]

commit 8236d267ce37a1299a992a03bf548fd7c5b48742
Merge: d1ebe97 7cc74b6
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue May 13 07:29:24 2014 -0500

    Merge branch 'f20' into f19
    
    Merge is needed because f19 doesn't have an f20 mass rebuild
    changelog entry that the f20 and master branches have.

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