[elpa] 30/30: Merge commit '60d4c09c982a1c562a70cd6aa705f47ab3badcfb' from company

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 0750e137a5b855ffccab43496ec06691aec319e5
Merge: a7fe5bb 60d4c09
Author: Dmitry Gutov <address@hidden>
Date:   Wed Oct 15 02:22:15 2014 +0400

    Merge commit '60d4c09c982a1c562a70cd6aa705f47ab3badcfb' from company

 packages/company/NEWS.md                 |    9 ++++
 packages/company/company-bbdb.el         |   11 +++--
 packages/company/company-clang.el        |    7 ++-
 packages/company/company-dabbrev-code.el |    8 ++--
 packages/company/company-dabbrev.el      |   15 ++++--
 packages/company/company-files.el        |   51 +++++++++++++--------
 packages/company/company-gtags.el        |    1 +
 packages/company/company-template.el     |   59 +++++++++++++++++-------
 packages/company/company-tests.el        |   36 ++++++++++++++-
 packages/company/company-yasnippet.el    |   12 ++++-
 packages/company/company.el              |   73 ++++++++++++++++++++----------
 11 files changed, 202 insertions(+), 80 deletions(-)