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

[Rex Dieter]

commit b2a5ed4d94a58aeb17ac7b05f3ac3946a3b999d7
Merge: 1d260a9 3d6b2d3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:36:39 2014 -0500

    Merge branch 'master' into f20

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