[fish/f19] (2 commits) ...Update to 2.1.1 and drop lots of patches

[amluto]

Summary of changes:

  e861ac7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  547de75... Update to 2.1.1 and drop lots of patches (*)

(*) This commit already existed in another branch; no separate mail sent