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

[Rex Dieter]

commit 14b484ffb187b95b96057f6abadd2ecfd4e39eb2
Merge: 7b8b4c3 a4e145d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:40:53 2014 -0500

    Merge branch 'master' into f20

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