[ELPA-diffs] [elpa] 14/14: Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' from company

[emacs-devel]

This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit e6d8543056c171b8f295ed35979ad925c9dda6be
Merge: 25219bd 67a96db
Author: Dmitry Gutov <address@hidden>
Date:   Tue Jan 14 15:39:37 2014 +0200

    Merge commit '67a96dbbfe645b64291ed62eab6f1eb391a834e0' from company
    
    Conflicts:
        packages/company/company-elisp.el
        packages/company/company-oddmuse.el

 packages/company/.travis.yml        |   20 ++++++++++
 packages/company/Makefile           |    2 +-
 packages/company/NEWS.md            |    8 ++++
 packages/company/company-capf.el    |   26 +++++++++++---
 packages/company/company-dabbrev.el |    2 +-
 packages/company/company-elisp.el   |    2 +-
 packages/company/company-ispell.el  |    2 +-
 packages/company/company-oddmuse.el |    2 +-
 packages/company/company-tests.el   |   60 +++++++++++++++++++++++++++++++
 packages/company/company.el         |   67 ++++++++++++++++++++++++++--------
 10 files changed, 165 insertions(+), 26 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.