From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 23 Jun 2016 00:27:52 +0000 (+0300)
Subject: Merge commit '212c8fc3101781a2f1c55ca61772eb75a2046e87' from company
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/7a2deffbe4a7865b42e31ad2eabd05221468f07c

Merge commit '212c8fc3101781a2f1c55ca61772eb75a2046e87' from company
---

7a2deffbe4a7865b42e31ad2eabd05221468f07c
diff --cc packages/company/test/bbdb-tests.el
index 000000000,b1f21b958..b1f21b958
mode 000000,100644..100644
--- a/packages/company/test/bbdb-tests.el
+++ b/packages/company/test/bbdb-tests.el