[koha-commits] main Koha release repository branch master updated. v3.06.00-562-gb1121b1

[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  b1121b11b52f14b3356ab3cbc505b4fd9a450626 (commit)
       via  831e14e89e7c4af998d5b7d7926b08a8eba22c76 (commit)
       via  2d67771157e9c07f5e907fc6507bbd9fabb3b82c (commit)
       via  0f80707d7c7b609fab357b12913da242b212e63b (commit)
      from  e780e0669c8b2d2a50a7996ab76e584c4cd4c59d (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 b1121b11b52f14b3356ab3cbc505b4fd9a450626
Merge: 2d67771 831e14e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Feb 15 17:23:35 2012 +0100

    Merge remote-tracking branch 'origin/new/bug_7238'

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

Summary of changes:
 debian/rules                                       |    1 +
 {etc => debian/templates}/SIPconfig.xml            |   24 ++--
 .../en/modules/admin/marc_subfields_structure.tt   |    7 -
 .../prog/en/modules/members/mancredit.tt           |    4 +-
 .../prog/en/modules/members/maninvoice.tt          |    4 +-
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |   47 ++++---
 .../prog/en/modules/members/paycollect.tt          |  159 +++++++++-----------
 7 files changed, 119 insertions(+), 127 deletions(-)
 copy {etc => debian/templates}/SIPconfig.xml (87%)


hooks/post-receive
-- 
main Koha release repository