[koha-commits] main Koha release repository branch master updated. v3.06.00-288-g7ea4760

[Git repo owner]

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 "main Koha release repository".

The branch, master has been updated
       via  7ea4760b06fa90314f0f7d8d165029100b804f02 (commit)
       via  f84c19fa70323b4fa89c0ff253e381619b7b14f0 (commit)
      from  2202ee78c3abf41aa46d131036b1a4162c8faf35 (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 7ea4760b06fa90314f0f7d8d165029100b804f02
Merge: 2202ee7 f84c19f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Jan 6 11:03:25 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_6880'
    
    Conflicts:
    	kohaversion.pl

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    2 +-
 kohaversion.pl                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository