[imapsync/el5] (2 commits) ...Merge branch 'master' into el5

[Nick Bebout]

Summary of changes:

  7d0c95d... Update to 1.504 (*)
  1681843... Merge branch 'master' into el5

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