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

[Christopher Meng]

commit 09754269ed9bdc0bd4a94ddb688b482a02901b2f
Merge: 5011f2c 40a09b1
Author: Christopher Meng <i at cicku.me>
Date:   Thu Nov 27 06:31:59 2014 -0500

    Merge branch 'master' into f21

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