[elpa] 52/52: Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit c828ee6d19b57256e1fa2321dc830fe5a6cf8af1
Merge: 9b6551e 7c14ded
Author: Dmitry Gutov <address@hidden>
Date:   Tue Jul 1 14:52:40 2014 +0300

    Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company
    
    Conflicts:
        packages/company/company-pysmell.el

 packages/company/NEWS.md                 |   16 ++
 packages/company/company-capf.el         |    4 +-
 packages/company/company-clang.el        |   20 +-
 packages/company/company-css.el          |  153 +++++++++++-
 packages/company/company-dabbrev-code.el |   31 ++-
 packages/company/company-dabbrev.el      |   29 ++-
 packages/company/company-eclim.el        |    6 +-
 packages/company/company-etags.el        |    6 +-
 packages/company/company-files.el        |   14 +-
 packages/company/company-gtags.el        |   57 +++--
 packages/company/company-keywords.el     |    1 +
 packages/company/company-pysmell.el      |    4 +-
 packages/company/company-semantic.el     |    3 +-
 packages/company/company-template.el     |    3 +-
 packages/company/company-tests.el        |   63 +++++-
 packages/company/company-xcode.el        |    3 +-
 packages/company/company-yasnippet.el    |    5 +-
 packages/company/company.el              |  377 ++++++++++++++++++------------
 18 files changed, 549 insertions(+), 246 deletions(-)