[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.1.3-50-ge18fe98

[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  e18fe98d47a8194dfe5308293a7e9e3bf35802e1 (commit)
       via  882a051eebc1f4bd4f326399dbf78335fe00a443 (commit)
       via  a7425c548f668ca491c7c23ab1459c7341173734 (commit)
       via  a08d42694bef975094af24eeced4d33c554a9935 (commit)
      from  8f31851766e459f40631fac86f26f75351d985f3 (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 e18fe98d47a8194dfe5308293a7e9e3bf35802e1
Merge: 8f31851 882a051
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 18:38:50 2012 +0200

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

commit 882a051eebc1f4bd4f326399dbf78335fe00a443
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 18:37:52 2012 +0200

    Bump version

commit a7425c548f668ca491c7c23ab1459c7341173734
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 18:37:35 2012 +0200

    Missing log object

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

Summary of changes:
 galette/lib/Galette/IO/News.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


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

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