[koha-commits] main Koha release repository branch, master, updated. html_template_pro-299-gd4f2bde

[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  d4f2bde05474bec3bb9534b510d424e2c5e792ed (commit)
       via  1c5005beb20962778b28b6a3418fddb0d0c90e5a (commit)
       via  2fb5b73e6b51c28d12176d33b051b20c1a48b88a (commit)
      from  9bb2554e39c583fb994a9d6bb487a75fc7c7251e (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 d4f2bde05474bec3bb9534b510d424e2c5e792ed
Merge: 9bb2554e39c583fb994a9d6bb487a75fc7c7251e 1c5005beb20962778b28b6a3418fddb0d0c90e5a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Apr 14 13:36:57 2011 +1200

    Merge branch 'new/enh/bug_5917' into kcmaster

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

Summary of changes:
 .../prog/en/modules/catalogue/results.tt           |    8 +++---
 misc/translator/TmplTokenizer.pm                   |   23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository