From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Sat, 23 May 2015 11:23:54 +0000 (+0200)
Subject: Merge commit 'e084b5d9feab3dd1246e51ce1fddde3db6024f7d' from swiper
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/740b7e6f0e7f3dbc7f40600dffccf131c46a3607

Merge commit 'e084b5d9feab3dd1246e51ce1fddde3db6024f7d' from swiper

Conflicts:
	packages/swiper/ivy.el
---

740b7e6f0e7f3dbc7f40600dffccf131c46a3607