[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.2.3-26-g892e289

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/galette.git".

The branch, develop has been updated
       via  892e289949e0bc3f8c9e289b875b40396c7a737d (commit)
       via  5179183a169d5408f1a262202385fe9217d4c3c1 (commit)
       via  1d0afafdfaec552a6e7dadd1de5cf2cb09d9d8a9 (commit)
       via  4b01556bab2705d27a8b365b43146244a80aab8e (commit)
      from  bf5011b2e06c70f101513fb7653825b4cbfb934b (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 -----------------------------------------------------------------
commit 892e289949e0bc3f8c9e289b875b40396c7a737d
Merge: bf5011b 5179183
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Wed Dec 5 10:36:08 2012 +0100

    Merge branch 'hotfix/0.7.2.4' into develop
    
    Conflicts:
    	galette/ajax_plugins_initdb.php

commit 5179183a169d5408f1a262202385fe9217d4c3c1
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Wed Dec 5 10:31:22 2012 +0100

    sql_parse script is used for plugins initialization; but install directory is removed; fixes #432

commit 1d0afafdfaec552a6e7dadd1de5cf2cb09d9d8a9
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Wed Dec 5 10:17:47 2012 +0100

    Bump version

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

Summary of changes:
 galette/ajax_plugins_initdb.php             |    2 +-
 galette/includes/galette.inc.php            |    2 +-
 galette/{install => includes}/sql_parse.php |    0
 galette/install/index.php                   |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename galette/{install => includes}/sql_parse.php (100%)


hooks/post-receive
--
galette/galette.git

-- 
-- 
Galette repositories commits - http://galette.tuxfamily.org