[perl-Fsdb/f20: 3/3] Merge branch 'master' into f20

[John Heidemann]

commit 744631a9702aee082c23c63c12130ede5b98795b
Merge: bed396f fb14469
Author: John Heidemann <johnh at isi.edu>
Date:   Mon Jan 5 23:38:21 2015 -0800

    Merge branch 'master' into f20

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