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

[Rex Dieter]

commit a89a1189d2f4d7f3ee9a1b45a7ca0bc1e4e593eb
Merge: 3ccd9f1 b70e09c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:22:41 2014 -0500

    Merge branch 'master' into f20

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