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

[Bruno Wolff III]

commit e71c9c005addd0a551a6beed971596693d800790
Merge: 4c7a24a dbf7edc
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Wed May 14 07:56:05 2014 -0500

    Merge branch 'f20' into f19
    
    Conflicts:
    	sources
    	squashfs-tools.spec

 sources             |    5 +++++
 squashfs-tools.spec |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc sources
index ee1bb9c,b8c0d51..d7e8076
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,8 @@@
  d92ab59aabf5173f2a59089531e30dbf  squashfs4.3.tar.gz
++<<<<<<< HEAD
 +235a2a9f839383a0a15dc7836c1c1693  mksquashfs.1
 +ad06b65980fe81bf155e22a67d732607  unsquashfs.1
++=======
+ 7f834f7e4306737b5d7755a1ed61307d  mksquashfs.1
+ 68bf9bbf3ba00dc6e480a59b24905185  unsquashfs.1
++>>>>>>> f20