[ark/f18: 15/15] Merge branch 'f19' into f18

[Rex Dieter]

commit c84886a052192aaf4dd6fd9b980f336fce4a1742
Merge: e2ce1c9 841230e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jul 28 10:26:55 2013 -0500

    Merge branch 'f19' into f18
    
    Conflicts:
    	.gitignore
    	ark.spec

 ark.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---