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

[Christopher Meng]

commit 5011f2c272e06afbd5f931483d4a795f13ef7bfa
Merge: 45b6fe0 5eb12c1
Author: Christopher Meng <i at cicku.me>
Date:   Mon Aug 25 10:46:22 2014 +0800

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

 .gitignore     |    1 +
 libsodium.spec |   12 ++++++------
 sources        |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
---