[koha-commits] main Koha release repository branch master updated. v3.06.00-286-g2202ee7

[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  2202ee78c3abf41aa46d131036b1a4162c8faf35 (commit)
       via  f22781971379824da0f1249fec0beac2478c80e6 (commit)
      from  236747534115e35975de8d51554e6e87f4248462 (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 2202ee78c3abf41aa46d131036b1a4162c8faf35
Merge: 2367475 f227819
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Jan 6 10:59:05 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_6530'
    
    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