Merge remote-tracking branch 'origin/new/bug_7143'
authorPaul Poulain <paul.poulain@biblibre.com>
Mon, 25 Jun 2012 16:01:28 +0000 (18:01 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Mon, 25 Jun 2012 16:01:28 +0000 (18:01 +0200)
1  2 
about.pl
docs/history.txt

diff --cc about.pl
Simple merge
Simple merge