[koha-commits] main Koha release repository branch, master, updated. html_template_pro-321-g7e86e23

[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  7e86e23ea1846bf26f1ebf75fd834faa896eb9e9 (commit)
       via  5574c350d4d7c53bc082e3939e1116432dd5f0b6 (commit)
       via  48cc802e46d09c9b1acd4b13105fefab88acbe18 (commit)
      from  7457243d4d54a76588d51d1833df3517ee40988b (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 7e86e23ea1846bf26f1ebf75fd834faa896eb9e9
Merge: 7457243d4d54a76588d51d1833df3517ee40988b 5574c350d4d7c53bc082e3939e1116432dd5f0b6
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Apr 18 11:45:47 2011 +1200

    Merge remote branch 'kc/new/enh/bug_5917' into kcmaster

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

Summary of changes:
 misc/translator/TmplTokenizer.pm |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository