[analitza/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit bfa934215632e7201ed8be9cd651071fc13c1e64
Merge: 126c5d6 618b373
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:31:56 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    5 +++++
 analitza.spec |   23 ++++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
---