[Opengeoscience-developers] OpenGeoscience branch, next, updated. master-no-submodule-68-g54d867e

[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  54d867edc1926bcbc4d41ab5fa7435692f02527a (commit)
       via  b318e7c7bdcd1e09afeeee523c514ba968d49b8d (commit)
       via  186b9306eb77293ffd6d97a48c377013bbe12968 (commit)
      from  158e1e278b45c2a64ba8e8a0117b88bc2ed51b01 (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=54d867edc1926bcbc4d41ab5fa7435692f02527a
commit 54d867edc1926bcbc4d41ab5fa7435692f02527a
Merge: 158e1e2 b318e7c
Author: Ben Burnett <benbu at nyu.edu>
Date:   Thu Nov 7 11:16:32 2013 -0700

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

 web/apps/archive/archive.css |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

Summary of changes:
 web/apps/archive/archive.css |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenGeoscience