[imapsync/el6/master] (7 commits) ...Merge branch 'master' into el6

[Nick Bebout]

Summary of changes:

  1679ffa... Fix typo that causes a failure to update the common directo (*)
  fa716e6... Update to imapsync 1.311 (*)
  2dbafae... Upgrade to 1.315 (*)
  7429d36... Upgrade to 1.337 (*)
  c52d612... dist-git conversion (*)
  5a80d27... Upgrade to 1.340 (*)
  e52a6d8... Merge branch 'master' into el6

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