[Opengeoscience-developers] OpenGeoscience branch, next, updated. 3dff48bbc5a00e8a9a848a0e445085a8052a133f

[Aashish Chaudhary]

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  3dff48bbc5a00e8a9a848a0e445085a8052a133f (commit)
       via  f1ebc04a987b59e2c869e88793f4fb0658b9b1c5 (commit)
      from  755e873ff89e8c0e84f856529c85fe3ba67d39f2 (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=3dff48bbc5a00e8a9a848a0e445085a8052a133f
commit 3dff48bbc5a00e8a9a848a0e445085a8052a133f
Merge: 755e873 f1ebc04
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Thu Aug 22 12:09:31 2013 -0400

    Merge remote-tracking branch 'origin/runtime_import' into next
    
    * origin/runtime_import:
      Fixed bad merge resolution

 modules/mongoimp.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

Summary of changes:
 modules/mongoimp.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenGeoscience