[dolphin-plugins/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 7262fe83c839d98fafcf6383b01a823a02ece480
Merge: b2a5ed4 c4de424
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:20:57 2014 -0500

    Merge branch 'master' into f20

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