[synergy/el6] (5 commits) ...Merge branch 'master' into el6

[Matthias Saou]

Summary of changes:

  9bfba25... Fix typo that causes a failure to update the common directo (*)
  00bb309... Retire synergy, obsoleted by synergy-plus. (*)
  cb298f2... Even remove Makefile. (*)
  71d04ce... Un-retire synergy, it merged back with synergy+
  35d4095... Merge branch 'master' into el6

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