[perl-Log-Dispatch/f21: 2/2] Merge remote-tracking branch 'origin/master' into f21

[corsepiu]

commit f366baa96dbfb28921563ead7dc05582554b7df6
Merge: 4a7b990 03f18b5
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Oct 21 18:07:59 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21

 .gitignore             |    2 +-
 perl-Log-Dispatch.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---