Merge branch 'rel_2_5_0' into rel_2_5_1

Conflicts:
	ChangeLog
	Open-ILS/src/perlmods/lib/OpenILS.pm
	Open-ILS/src/perlmods/lib/OpenILS/Application.pm
	Open-ILS/src/sql/Pg/002.schema.config.sql
	Open-ILS/xul/staff_client/chrome/content/main/about.html
	Open-ILS/xul/staff_client/defaults/preferences/prefs.js
	README
	configure.ac

diff --cc Open-ILS/src/templates/opac/css/style.css.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 9c8407b,1daf8c6..528be29
--- 1/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
--- 2/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@@ -90,16 -90,18 +90,18 @@@ END; # FOREACH bi
              END;
          -%]
          <tr class="copy_details_offers_row" property="offers" typeof="Offer">
 -            [%- IF serial_holdings %]<td header='copy_header_holding_label' class='rdetail-issue-issue'>
 +            [%- IF serial_holdings %]<td headers='copy_header_holding_label' class='rdetail-issue-issue'>
                  [%- copy_info.holding_label | html; -%]
              </td>
 -            [%- ELSE %]<td header='copy_header_library' property="seller">
 +            [%- ELSE %]<td headers='copy_header_library' property="seller">
              [%-
-                 org_name = ctx.get_aou(copy_info.circ_lib).name;
-                 lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url');
-                 IF lib_url; '<a href="'; lib_url | url; '">'; END;
-                 org_name | html;
-                 IF lib_url; '</a>'; END;
+               org_obj = ctx.get_aou(copy_info.circ_lib); 
+                IF org_obj.parent_ou;   
+                        parent_org_name = ctx.get_aou(org_obj.parent_ou).name;
+                        org_name = parent_org_name _ ' - ' _ org_obj.name; 
+                ELSE; 
+                 org_name = org_obj.name; END;
+                 org_name | html
              -%]
                  <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                  <link property="itemOffered" href="#schemarecord">