[koha-commits] main Koha release repository branch master updated. v3.06.00-770-gc9d0c16

[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  c9d0c168679d6b225e305b45331e1e86ee4939d1 (commit)
       via  932296415b74702ca759892fa019ee252437b78a (commit)
       via  c6746ff4a33bcfbe317e7ad7039a35e14ff097e1 (commit)
       via  1d1786f60ce2f36efdfad1376adb514d85c663d1 (commit)
       via  90ba8e846a6716fb99f4ad28aeeb97a301075313 (commit)
       via  dc18719e3a46a30111de43f8b3a510649a678a36 (commit)
       via  b38aec8aae59f4c634f7a8534c43f193cf219068 (commit)
      from  74753b4b69eba4a23a8e37f48bf402482136a367 (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 c9d0c168679d6b225e305b45331e1e86ee4939d1
Merge: c6746ff 9322964
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Mar 20 15:03:15 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_7408'
    
    Conflicts:
    	installer/data/mysql/sysprefs.sql

commit c6746ff4a33bcfbe317e7ad7039a35e14ff097e1
Merge: 90ba8e8 1d1786f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Mar 20 14:54:10 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_8250'

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

Summary of changes:
 circ/overdue.pl                                    |    4 ++-
 installer/data/mysql/sysprefs.sql                  |    1 -
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    2 +-
 suggestion/suggestion.pl                           |   23 ++++++++++++-------
 4 files changed, 18 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository