[qgit/el6] (6 commits) ...Merge branch 'master' into el6

[Dan Horák]

Summary of changes:

  3433430... Fix typo that causes a failure to update the common directo (*)
  da05ed1... dist-git conversion (*)
  1bc9375... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  203d03d... update for git 1.7.5 (#708251) (*)
  f0ebcba... update to 2.4 switched to new upstream (*)
  d6e380f... Merge branch 'master' into el6

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