From: Dmitry Gutov <dgutov@yandex.ru>
Date: Tue, 1 Jul 2014 11:52:40 +0000 (+0300)
Subject: Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/c828ee6d19b57256e1fa2321dc830fe5a6cf8af1

Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company

Conflicts:
	packages/company/company-pysmell.el
---

c828ee6d19b57256e1fa2321dc830fe5a6cf8af1