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

[Rex Dieter]

commit 453fe655c3b25ef0ee0e1ec503ad41cce343376b
Merge: bfa9342 799a9d6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 09:36:28 2014 -0500

    Merge branch 'master' into f20

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