[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.1.5-58-gb25afca

[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  b25afcaba1068d7d47d9153edd7913d8964a85f7 (commit)
       via  165e0cab211eddfa1c32e2a83e009778576c029f (commit)
       via  5b66bff974790dac078259807ee3aa524507b190 (commit)
       via  ec95813b1a777d11aae6cd8d322b021ebd6a112c (commit)
      from  9decc9b535880580e39b971b2fb100b1a49a12bf (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 b25afcaba1068d7d47d9153edd7913d8964a85f7
Merge: 9decc9b 165e0ca
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 08:37:33 2012 +0200

    Merge branch 'hotfix/0.7.1.6' into develop
    
    Conflicts:
    	galette/ajouter_contribution.php
    	galette/includes/galette.inc.php

commit 165e0cab211eddfa1c32e2a83e009778576c029f
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 08:24:47 2012 +0200

    Performance issue when adding contribution, fixes #387
    Conflicts:
    	galette/ajouter_contribution.php

commit 5b66bff974790dac078259807ee3aa524507b190
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 08:31:40 2012 +0200

    Bump version

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

Summary of changes:


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

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