Merge remote-tracking branch 'origin/new/bug_6875'
authorPaul Poulain <paul.poulain@biblibre.com>
Mon, 20 Feb 2012 15:45:42 +0000 (16:45 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Mon, 20 Feb 2012 15:45:42 +0000 (16:45 +0100)
1  2 
C4/Biblio.pm
acqui/neworderempty.pl

diff --cc C4/Biblio.pm
Simple merge
Simple merge