[armadillo/el6: 24/24] Merge branch 'master' into el6

[rcurtin]

commit 0e9052df0f79701bce563a6c9d9cb6548787e6ec
Merge: 2b0b173 180fc8f
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date:   Tue Jul 15 10:00:44 2014 -0400

    Merge branch 'master' into el6

 .gitignore     |    2 +-
 armadillo.spec |   96 +++++++++++++++++++++++++++++++++++++++++++++++---------
 sources        |    2 +-
 3 files changed, 83 insertions(+), 17 deletions(-)
---