Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim unilim_maj_120411
authorClaire Hernandez <claire.hernandez@biblibre.com>
Tue, 10 Apr 2012 15:27:36 +0000 (17:27 +0200)
committerClaire Hernandez <claire.hernandez@biblibre.com>
Tue, 10 Apr 2012 15:27:36 +0000 (17:27 +0200)
commit4c4ea31d33f95968b727c3ab91ef4cdcd8d7b2d4
treeb206e69db77a25f959b29b59f6a568b54445c3fd
parent8fa5b87b406e83107ed3753ad576f311fb1aa8a1
parentf92c388ee88d43473d94496a7f59766f29173be2
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
C4/Letters.pm
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl