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

[Christopher Meng]

commit 521fa81690773ed3af423d1ef6b3e915665a62bb
Merge: 2d5db1b 6c08b13
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 17 10:30:32 2014 +0800

    Merge branch 'master' into epel7

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