[koha-commits] main Koha release repository branch master updated. v3.06.00-284-g2367475

[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  236747534115e35975de8d51554e6e87f4248462 (commit)
       via  e0095c55852a9c4614ea37df67c4882f9fc3128f (commit)
       via  8fd578800eb104b104e98c9dc7be1ed8a79bf2cc (commit)
      from  1730e180cdbe11a7878ddfab54cec7291d12f430 (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 236747534115e35975de8d51554e6e87f4248462
Merge: 1730e18 e0095c5
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Jan 6 10:52:47 2012 +0100

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

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

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


hooks/post-receive
-- 
main Koha release repository