[cryptsetup/f21: 4/4] Merge branch 'master' into f21

[Milan Broz]

commit d40e2a71d6f177f37e35f772879f2d01501a2f8c
Merge: d801f3d 55872b7
Author: Milan Broz <gmazyland at gmail.com>
Date:   Sat Aug 16 13:28:16 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	cryptsetup.spec

 .gitignore                |    2 +-
 cryptsetup-1.6.5.tar.sign |   17 -----------------
 cryptsetup-1.6.6.tar.sign |   17 +++++++++++++++++
 cryptsetup.spec           |    7 +++++--
 sources                   |    2 +-
 5 files changed, 24 insertions(+), 21 deletions(-)
---