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

[Rex Dieter]

commit 39da5eedf99588b625270e7c39bcc5cff9dda614
Merge: b589ce7 0071e27
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:51:58 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    1 +
 rocs.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---