* Merge from debian testing.  Remaining changes: (LP: #520281)
  - debian/rules:
    + Fix FTBFS with python >= 2.6
    + Include dh_icons
  - debian/patches/091_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/patches/092_typo_de_translation.dpatch:
    + Fix German translation typo
  - debian/patches/00list:
    + Include 040_xhtml.dpatch
* Rename Ubuntu specific patches to avoid confusion with Debian's patches:
  - 91_panel_category.dpatch -> 091_panel_category.dpatch
  - 92_typo_de_translation.dpatch -> 092_typo_de_translation.dpatch
* debian/patches/00list: Update with new Ubuntu specific patch names
* Dropped changes now applied upstream:
  - debian/patches/94_url_decoding.dpatch:
    - Patches io.py to unquote file url during the normalisation process
* Dropped changes no longer required:
  - debian/patches/010_intltool.dpatch:
    + Remove intltool files when cleaning
  - debian/patches/020_server_data.dpatch:
    + Remove GNOME_RevelationApplet.server when cleaning
  - debian/patches/93_python26_transition.dpatch:
    + Patches aclocal.m4 to return the correct value for 
      cv_python_pyexecdir
* debian/patches/100_backup_on_save.dpatch: (LP: #338138)
  Patches io.py to create a backup file before saving and restore
  the backup if saving fails