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

[Rex Dieter]

commit e735c5d5bb8621e91210f489ea8a960847ce3ad2
Merge: 2bdecfe 4d33244
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:34:39 2014 -0500

    Merge branch 'master' into f20

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