[libsodium/epel7: 2/2] Merge branch 'master' into epel7

[Christopher Meng]

commit 99cc14c895073e16bcc30a295727810ddb591057
Merge: 35af97d 40a09b1
Author: Christopher Meng <i at cicku.me>
Date:   Thu Nov 27 06:31:54 2014 -0500

    Merge branch 'master' into epel7

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