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

[John Heidemann]

commit 2e243f2a3ee4986382e64e3128f70e6940671a0e
Merge: bdb64e8 f794230
Author: John Heidemann <johnh at isi.edu>
Date:   Tue Feb 3 22:01:47 2015 -0800

    Merge branch 'master' into f21

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