[hplip/f15] (2 commits) ...Merge branch 'f14' into f15

[Jiří Popelka]

Summary of changes:

  3377ab9... revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change ( (*)
  be89e78... Merge branch 'f14' into f15

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