[koha-commits] main Koha release repository branch, master, updated. html_template_pro-332-gad37f3e

[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  ad37f3e5e7175cb3a2a5785d552f6e06affaea97 (commit)
       via  e7caa309ed7e71bd3c83358e891b9c5fdfa3bab8 (commit)
      from  80cd49f8f752bb426e3797e263da03725360cf34 (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 ad37f3e5e7175cb3a2a5785d552f6e06affaea97
Merge: 80cd49f8f752bb426e3797e263da03725360cf34 e7caa309ed7e71bd3c83358e891b9c5fdfa3bab8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Apr 19 16:21:40 2011 +1200

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

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

Summary of changes:
 misc/translator/TTParser.pm      |    4 ++--
 misc/translator/TmplTokenizer.pm |    3 ++-
 misc/translator/xgettext.pl      |    3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository