[Opengeoscience-developers] OpenGeoscience branch, next, updated. master-no-submodule-52-g637c39e

[Ben Burnett]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".

The branch, next has been updated
       via  637c39e51c01a9301dada413c0dd17c19a590886 (commit)
       via  8aca5bd30b492231a3c46b594e4b583b3ec06dab (commit)
       via  7c32d8e2f2941131f41ec0f8c0e9ee6bc5cc3b32 (commit)
       via  b61dab6eaaef945f3a9fdc741716c63fb29e35b2 (commit)
       via  8a45cf569a4cf9d15e84d041fbe046746eee1a60 (commit)
       via  9ee5ded06f9d47d5e66edef0ea814e7d37e3d7b4 (commit)
      from  1afbd31279a206bd29aa9ecb24d11758b3f5f661 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=637c39e51c01a9301dada413c0dd17c19a590886
commit 637c39e51c01a9301dada413c0dd17c19a590886
Merge: 1afbd31 8aca5bd
Author: Ben Burnett <benbu at nyu.edu>
Date:   Tue Nov 5 17:29:28 2013 -0700

    Merge branch '161-list-variables-on-search' into next
    
    Conflicts:
    	web/apps/archive/archive.css

 modules/esgf/query.py        |    6 +-
 web/apps/archive/archive.css |   20 +++
 web/apps/archive/archive.js  |  285 +++++++++++++++++++++++++++---------------
 web/apps/archive/index.html  |   16 ++-
 4 files changed, 221 insertions(+), 106 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 modules/esgf/query.py        |    6 +-
 web/apps/archive/archive.css |   20 +++
 web/apps/archive/archive.js  |  285 +++++++++++++++++++++++++++---------------
 web/apps/archive/index.html  |   16 ++-
 4 files changed, 221 insertions(+), 106 deletions(-)


hooks/post-receive
-- 
OpenGeoscience