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

[Rex Dieter]

commit b589ce7f528c58f620c691fc965682def1ab16dd
Merge: 4cd17af fb660a1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:23:24 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 rocs.spec  |   32 ++++++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
---