[ELPA-diffs] [elpa] 03/03: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa

[Michael Albinus]

albinus pushed a commit to branch master
in repository elpa.

commit cb0aee3273917784380f81748aa9e77b8ba360a8
Merge: f52106d 61bde20
Author: Michael Albinus <address@hidden>
Date:   Tue Jan 28 10:53:17 2014 +0100

    Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa

 admin/archive-contents.el         |    2 +-
 admin/forward-diffs.py            |    3 +-
 admin/update-archive.sh           |    2 +-
 copyright_exceptions              |    1 +
 packages/README                   |   11 +-
 packages/cl-lib/cl-lib.el         |   55 ++++++-
 packages/company/NEWS.md          |    9 +-
 packages/company/company-capf.el  |   27 +++-
 packages/company/company-tests.el |   20 ++-
 packages/company/company.el       |  279 ++++++++++++++++++++++++++-----------
 packages/csv-mode/csv-mode.el     |   10 +-
 packages/sokoban/sokoban-pkg.el   |    1 -
 packages/sokoban/sokoban.el       |    4 +-
 packages/wpuzzle/wpuzzle.el       |   10 ++-
 14 files changed, 311 insertions(+), 123 deletions(-)