Merge remote-tracking branch 'origin/new/bug_7083'
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 18 Jan 2012 15:20:26 +0000 (16:20 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 18 Jan 2012 15:20:26 +0000 (16:20 +0100)
commit0b0212cae3497f7746eb58a5397453c6e0173ba0
treede0d667584be688aee5c184f411fb60efff6449f
parentb70e4f3d6d3ebca19c83a96de6770e572620c651
parent2951d83e9de190566a28c4ea572886b13059f37b
Merge remote-tracking branch 'origin/new/bug_7083'
C4/VirtualShelves/Page.pm
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt