[Reportbug-maint] Bug#458572: [reportbug/master]

[eb4d968...f15fcd8... at alioth.debian.org]

tag 528956 pending
tag 458572 pending
tag 529660 pending
thanks

Date: Sandro Tosi <morph at debian.org>
Author: eb4d968... f15fcd8...
Commit ID: 936ab2569cf29487d342757b301784931973e959
Commit URL: http://git.debian.org/?p=reportbug/reportbug.git;a=commitdiff;h=936ab2569cf29487d342757b301784931973e959
Patch URL: http://git.debian.org/?p=reportbug/reportbug.git;a=commitdiff_plain;h=936ab2569cf29487d342757b301784931973e959

    
    fixed merge conflict