[elpa] 04/04: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

[Mario Lang]

mlang pushed a commit to branch master
in repository elpa.

commit 9a378dacf0b34221bb7c252dc20ff70b388fbb31
Merge: bf2c2a3 9a44292
Author: Mario Lang <address@hidden>
Date:   Fri May 30 14:02:45 2014 +0200

    Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 README                                             |    4 +-
 admin/archive-contents.el                          |   70 +-
 admin/forward-diffs.py                             |   10 +-
 packages/ada-mode/NEWS                             |   19 +
 packages/ada-mode/README                           |    4 +-
 packages/ada-mode/ada-gnat-xref.el                 |    4 +-
 packages/ada-mode/ada-grammar-wy.el                | 2671 ++++++++++----------
 packages/ada-mode/ada-mode.el                      |   89 +-
 packages/ada-mode/ada-mode.info                    |   81 +-
 packages/ada-mode/ada-wisi.el                      |    9 +-
 packages/ada-mode/gnat-core.el                     |   12 +-
 packages/ada-mode/gnat-inspect.el                  |   12 +-
 packages/ada-mode/gpr-mode.el                      |   11 -
 packages/ada-mode/gpr-query.el                     |   25 +-
 packages/ascii-art-to-unicode/HACKING              |    1 +
 packages/ascii-art-to-unicode/NEWS                 |    4 +
 .../ascii-art-to-unicode/ascii-art-to-unicode.el   |   25 +-
 packages/gnugo/NEWS                                |    1 +
 packages/gnugo/gnugo-frolic.el                     |  203 +-
 packages/gnugo/gnugo-imgen.el                      |   91 +-
 packages/gnugo/gnugo.el                            |  416 ++--
 packages/metar/metar.el                            |  568 +++++
 packages/nlinum/nlinum.el                          |   13 +-
 packages/osc/osc.el                                |  237 ++
 24 files changed, 2805 insertions(+), 1775 deletions(-)