[koha-commits] main Koha release repository branch, master, updated. v3.02.00-212-g0874050

[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  0874050dc6c4fadbf951d9c1a9ee034f8d8daaae (commit)
       via  14b66041f0dc08a5618985b44e1816a6c9978f45 (commit)
       via  a36a7e1e61ac0ef7b2b79065432f028edef9d49e (commit)
      from  40bb99763d2c818ac808ef6dc87fd449d43513d9 (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 0874050dc6c4fadbf951d9c1a9ee034f8d8daaae
Merge: 40bb99763d2c818ac808ef6dc87fd449d43513d9 14b66041f0dc08a5618985b44e1816a6c9978f45
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 19 09:53:19 2010 +1300

    Merge remote branch 'kc/new/bug_5004' into kcmaster

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

Summary of changes:
 admin/cities.pl                                    |    9 ++-------
 admin/roadtype.pl                                  |    8 --------
 .../prog/en/modules/admin/cities.tmpl              |   10 ----------
 3 files changed, 2 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
main Koha release repository