Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

Conflicts:
	packages/company/company-pysmell.el

diff --cc packages/company/.travis.yml
Simple merge

diff --cc packages/company/Makefile
Simple merge

diff --cc packages/company/NEWS.md
Simple merge

diff --cc packages/company/company-abbrev.el
Simple merge

diff --cc packages/company/company-bbdb.el
Simple merge

diff --cc packages/company/company-capf.el
Simple merge

diff --cc packages/company/company-clang.el
Simple merge

diff --cc packages/company/company-cmake.el
Simple merge

diff --cc packages/company/company-css.el
Simple merge

diff --cc packages/company/company-dabbrev-code.el
Simple merge

diff --cc packages/company/company-dabbrev.el
Simple merge

diff --cc packages/company/company-eclim.el
Simple merge

diff --cc packages/company/company-elisp-tests.el
index 0000000000000000000000000000000000000000,9b7cba33379bda942d69cf1bfc8ac158548881c2..9b7cba33379bda942d69cf1bfc8ac158548881c2
mode 000000,100644..100644
--- /dev/null
--- 2/company-elisp-tests.el
+++ b/packages/company/company-elisp-tests.el

diff --cc packages/company/company-elisp.el
Simple merge

diff --cc packages/company/company-etags.el
Simple merge

diff --cc packages/company/company-files.el
Simple merge

diff --cc packages/company/company-gtags.el
Simple merge

diff --cc packages/company/company-ispell.el
Simple merge

diff --cc packages/company/company-keywords.el
Simple merge

diff --cc packages/company/company-nxml.el
Simple merge

diff --cc packages/company/company-oddmuse.el
Simple merge

diff --cc packages/company/company-pysmell.el
index 5c44f06aafa799a522dcfac1546f8e6776d31f50,d9cf86b0fb9b5bb0b829c6d633342fea0e83b4a3..2f22bf0f53d5d1501d27220b4260f7eb65220952
--- 1/packages/company/company-pysmell.el
--- 2/company-pysmell.el
+++ b/packages/company/company-pysmell.el
@@@ -1,6 -1,6 +1,6 @@@
  ;;; company-pysmell.el --- company-mode completion back-end for pysmell.el
  
- ;; Copyright (C) 2009-2011, 2013  Free Software Foundation, Inc.
 -;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
++;; Copyright (C) 2009-2011, 2013-2014  Free Software Foundation, Inc.
  
  ;; Author: Nikolaj Schumacher
  
@@@ -27,8 -27,8 +27,8 @@@
  
  ;;; Code:
  
- (eval-when-compile (require 'cl))
 -(require 'pysmell)
 +(if t (require 'pysmell))               ;Don't load during compilation.
+ (require 'cl-lib)
  
  (defvar company-pysmell--available-p 'unknown)
  (make-variable-buffer-local 'company-pysmell--available-p)

diff --cc packages/company/company-ropemacs.el
Simple merge

diff --cc packages/company/company-semantic.el
Simple merge

diff --cc packages/company/company-template.el
Simple merge

diff --cc packages/company/company-tempo.el
Simple merge

diff --cc packages/company/company-tests.el
Simple merge

diff --cc packages/company/company-xcode.el
Simple merge

diff --cc packages/company/company-yasnippet.el
Simple merge

diff --cc packages/company/company.el
Simple merge