[elpa] 31/31: Merge commit '7be4321260f0c73ef4c3cadc646f6bb496650253' from company

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 7b3723888df292bef894601ee2054125d3832254
Merge: 864af57 7be4321
Author: Dmitry Gutov <address@hidden>
Date:   Tue Mar 18 07:18:11 2014 +0200

    Merge commit '7be4321260f0c73ef4c3cadc646f6bb496650253' from company

 packages/company/NEWS.md              |   11 ++
 packages/company/company-bbdb.el      |   49 ++++++++
 packages/company/company-keywords.el  |    2 +-
 packages/company/company-semantic.el  |   14 ++-
 packages/company/company-tests.el     |   87 +++++++++++++--
 packages/company/company-yasnippet.el |   94 ++++++++++++++++
 packages/company/company.el           |  194 +++++++++++++++++++++++----------
 7 files changed, 381 insertions(+), 70 deletions(-)

diff --cc packages/company/company-bbdb.el
index 0000000,8e4705f..8e4705f
mode 000000,100644..100644
--- a/packages/company/company-bbdb.el
+++ b/packages/company/company-bbdb.el
diff --cc packages/company/company-yasnippet.el
index 0000000,ae370c7..ae370c7
mode 000000,100644..100644
--- a/packages/company/company-yasnippet.el
+++ b/packages/company/company-yasnippet.el