[aajohan-comfortaa-fonts/el6/master] (2 commits) ...Merge branch 'master' into el6

[Luya Tshimbalanga]

Summary of changes:

  3dae216... fix directory location from upstream (*)
  a4e4504... Merge branch 'master' into el6

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