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)
1  2 
C4/VirtualShelves/Page.pm
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt

Simple merge