[adobe-source-sans-pro-fonts/f17] (5 commits) ...solve unsolved merge conflict

[Lameire Alexis]

Summary of changes:

  c3593da... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  5a6af2f... update to 1.050 upstream release (*)
  f75d116... solve dir bug on first compile (*)
  0630206... Merge branch 'master' of ssh://pkgs.fedoraproject.org/adobe (*)
  cfd74b6... solve unsolved merge conflict (*)

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