unilim_maj_120215

Livraison pré-production scd-limoges 15/02/2012

$ git sb  origin/dev/unilim  unilim_maj_120208
! [origin/dev/unilim] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
 ! [unilim_maj_120208] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
--
-  [bb8e2b0] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
+  [179a860] [SOLR] IndexQueue: FIX exit if error in thread
+  [baea6e8] [SOLR] Indexqueue : FIX add blocking
+  [c963f26] Revert "[SOLR] IndexRecordQueue modification"
+  [529a024] [SOLR] IndexRecordQueue modification
+  [a2a83e2] [SOLR] IndexRecordQueue modification
+  [7e49ad3] MT6843: Followup FIX and features in addorderiso2709.pl
+  [48eae06] MT8600: Display itemtype icon for previous checkouts
+  [a270cc5] MT8745: Do not require serials permission for subscription-bib-search.pl
+  [5fcf7fa] [SOLR] Add a new search format for date
+  [c9a442f] MT8691: Add syspref AuthSubfieldsToCheck
+  [996d543] Optim: Followup FIX Optim JS
+  [f2f6132] MT8713: Adds some stuff for histsearch.pl
+  [ddf99e0] MT8712: Don't let blank lines between address1 and zip/city/country   on delivery address when address2 and/or address3 are empty when   printing orders
+  [cd35a72] MT8712: Adds branchname to delivery address when printing orders
+  [f2d62b6] MT8318: Fix PO (staff, fr-FR)
-- [c4e7933] Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

$ git diff --numstat origin/dev/unilim unilim_maj_120208 | egrep -i "(tmpl|js|inc)"
52      23      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
4       2       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
2       4       koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc