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

[Rex Dieter]

commit 0c6f327f68dc3b846ea53c806298ef4b7baaba16
Merge: 2e0494c 375423f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:21:12 2014 -0500

    Merge branch 'master' into f20

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