dgutov pushed a commit to branch master
in repository elpa.
commit c87035c021a9be74f8420936c4c5043f417c02c2
Merge: 324e000 8dc8f95
Author: Dmitry Gutov <dgu...@yandex.ru>
Date: Sat Jan 25 13:34:56 2014 +0200
Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company
Conflicts:
packages/company/company-capf.el
packages/company/NEWS.md | 7 ++
packages/company/company-capf.el | 2 +-
packages/company/company-tests.el | 20 +++-
packages/company/company.el | 186 ++++++++++++++++++++++++++++---------
4 files changed, 166 insertions(+), 49 deletions(-)
