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

[John Heidemann]

commit 96d86285b9ef62a5fb00de2cc5aa25d2375ee0e1
Merge: 7f705e9 5d1be4b
Author: John Heidemann <johnh at isi.edu>
Date:   Wed Nov 26 23:55:36 2014 -0800

    Merge branch 'master' into f21

 .gitignore     |    2 +-
 perl-Fsdb.spec |   11 ++++-------
 sources        |    2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
---