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

[Rex Dieter]

commit 7a639311ec3a786420890e20f40c5470c8b66fc3
Merge: e735c5d 6d2efcb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:19:33 2014 -0500

    Merge branch 'master' into f20

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