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

[Rex Dieter]

commit 81f4dc82e49b652186b2448f97e45a45bc44abb4
Merge: b3d3295 451063b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:50:46 2014 -0600

    Merge branch 'master' into f20

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