[koha-commits] main Koha release repository branch master updated. v3.08.00-1282-g48ce46e

[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  48ce46e8fbcc2a249930bb8ee84b1aabc9667050 (commit)
       via  4fbadbaed42f6a5045246a13d228cbb678a9ab84 (commit)
       via  2512581533399bccbf785209918260f9b5031119 (commit)
       via  ea418af20558801d8ee6bad2e18327e4390df077 (commit)
       via  2c65bdcdcc735b273dc7479638989da4593368f2 (commit)
       via  e93cc449410f6c8d90b616f3d8e002e9ade4dadd (commit)
       via  6a265eb793bd8b4bb91339b1beb05a317bcf1df8 (commit)
       via  99ad10712e061d37c82d333849eb6fa78a275296 (commit)
       via  5511dad7028439f38e8197e54610b96c03f7848f (commit)
       via  aafcebef8fde3ef82d789dbac09e3eb9863a56bd (commit)
       via  3f60328b4f943fd340d6374980333ffd6ad0baa6 (commit)
       via  5293bb554076dd2e6d100b119857737be8951ac6 (commit)
      from  844593461226710f2d72ccaaa1d99a5776b84a34 (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 48ce46e8fbcc2a249930bb8ee84b1aabc9667050
Merge: 2512581 4fbadba
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 23 12:12:59 2012 -0500

    Merge branch 'bug_8664' into 3.12-master

commit 2512581533399bccbf785209918260f9b5031119
Merge: ea418af 99ad107
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 23 11:44:55 2012 -0500

    Merge branch 'bug_8758' into 3.12-master

commit ea418af20558801d8ee6bad2e18327e4390df077
Merge: e93cc44 2c65bdc
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 23 11:44:26 2012 -0500

    Merge branch 'bug_2832' into 3.12-master
    
    Conflicts:
    	kohaversion.pl
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit e93cc449410f6c8d90b616f3d8e002e9ade4dadd
Merge: 6a265eb 5511dad
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 23 11:41:48 2012 -0500

    Merge branch 'bug_2832' into 3.12-master
    
    Conflicts:
    	installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
    	installer/data/mysql/updatedatabase.pl
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 6a265eb793bd8b4bb91339b1beb05a317bcf1df8
Merge: 8445934 3f60328
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Nov 23 11:40:46 2012 -0500

    Merge branch 'bug_9008' into 3.12-master

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

Summary of changes:
 circ/returns.pl                                    |   66 --------------------
 .../nb-NO/1-Obligatorisk/system_preferences.sql    |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 +++
 .../intranet-tmpl/prog/en/css/preferences.css      |    4 +
 .../prog/en/modules/admin/preferences.tt           |    5 ++
 .../en/modules/admin/preferences/i18n_l10n.pref    |    5 ++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   18 -----
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |    7 ++
 .../prog/en/modules/members/member.tt              |    4 +-
 kohaversion.pl                                     |    2 +-
 mainpage.pl                                        |    7 ++
 members/members-home.pl                            |    3 +-
 13 files changed, 42 insertions(+), 89 deletions(-)


hooks/post-receive
-- 
main Koha release repository