• Stephane Glondu's avatar
    Merge NMU 1.05-15.1 · 78e812ac
    Stephane Glondu authored
    # Conflicts:
    #	debian/changelog
    #	debian/compat
    #	debian/control
    #	debian/copyright
    #	debian/gbp.conf
    #	debian/rules
    #	debian/xml-man/po4a/po4a.cfg
    78e812ac