[picmi/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 7b8b4c38dca4b75379a1b4fd21cfde3223576faa
Merge: a89a118 36b9a0d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:51:30 2014 -0500

    Merge branch 'master' into f20

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