* helm-buffers.el: Fix previous commit.
Merge branch 'master' into origin-exp

Conflicts:
	helm-buffers.el