[koha-commits] updated branch 3.0.x (2cd52cd70badb77674f0b1be59eaefbfb71098ce)

[Koha Gitosis]

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 "Koha GitWeb".

The branch, 3.0.x has been updated
       via  2cd52cd70badb77674f0b1be59eaefbfb71098ce (commit)
       via  c3aed6b007235820284aa016c893799ebbfb30db (commit)
      from  d4a93de66fba189a99ed453bff7d49c2915065d8 (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 2cd52cd70badb77674f0b1be59eaefbfb71098ce
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Mon Sep 21 14:54:57 2009 +0200

    Bug fixing Merge problem on opac-shelves.tmpl

commit c3aed6b007235820284aa016c893799ebbfb30db
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Mon Sep 21 10:23:57 2009 +0200

    Fixing AddReturn Bad Merge

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

Summary of changes:
 C4/Circulation.pm                                  |  133 +++++++++-----------
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |   94 ++++++++------
 2 files changed, 115 insertions(+), 112 deletions(-)


hooks/post-receive
-- 
Koha GitWeb