[perl-Fsdb/epel7: 2/2] Merge branch 'master' into epel7

[John Heidemann]

commit c85371f7708f3c8bee71b21bf9e155d2933802f7
Merge: 662addc f794230
Author: John Heidemann <johnh at isi.edu>
Date:   Tue Feb 3 22:02:12 2015 -0800

    Merge branch 'master' into epel7

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