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

[rcurtin]

commit 533f624989a5d7abf3badc7936464d2a05dc7ea5
Merge: c36c312 2b8ec9a
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date:   Fri Dec 5 21:22:59 2014 -0500

    Merge branch 'master' into el6

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