[perl-HTML-Format/f14: 4/4] Merge remote-tracking branch 'origin/f15' into f14

[corsepiu]

commit 1dfd6612b1dd6c11d74b522a8660be2caf73e77d
Merge: 207af04 8a1360a
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Aug 22 11:08:55 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore                 |    2 +-
 perl-HTML-Format-2.10.diff |   12 ++++++++++++
 perl-HTML-Format.spec      |   34 +++++++++++++++++++++++++++-------
 sources                    |    2 +-
 4 files changed, 41 insertions(+), 9 deletions(-)
---