[libsodium/epel7: 4/5] Merge branch 'master' into epel7

[Christopher Meng]

commit 3c7261ae4aa5d4b37c551f38dd6d9b5eac39f2b8
Merge: 521fa81 5eb12c1
Author: Christopher Meng <i at cicku.me>
Date:   Mon Aug 25 10:46:28 2014 +0800

    Merge branch 'master' into epel7

 .gitignore     |    1 +
 libsodium.spec |   13 ++++++++-----
 sources        |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---