* helm-eval.el (helm-eldoc-show-in-eval): Avoid error messages in emacs 24.4.
Merge branch 'master' into exp
* helm.el (helm-resume): Bind default-directory and reset helm-current-buffer.
Merge branch 'master' into exp