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

[Rex Dieter]

commit dde96d5a272ebc333ddd990ccfb1ef63d5c047d5
Merge: 81f4dc8 a004bb4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:16:06 2015 -0600

    Merge branch 'master' into f20

 .gitignore           |    1 +
 dolphin-plugins.spec |   19 +++++++++++++------
 sources              |    2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---