Merge remote-tracking branch 'origin/new/bug_8251'

author Paul Poulain <paul.poulain@biblibre.com>

Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)

committer Paul Poulain <paul.poulain@biblibre.com>

Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)
author Paul Poulain <paul.poulain@biblibre.com>
Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)
committer Paul Poulain <paul.poulain@biblibre.com>
Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)
diff --cc C4/Circulation.pm
Simple merge
diff --cc Koha/Calendar.pm
Simple merge
diff --cc members/moremember.pl
Simple merge
author	Paul Poulain <paul.poulain@biblibre.com>
	Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Mon, 16 Jul 2012 11:46:31 +0000 (13:46 +0200)
		1	2
C4/Circulation.pm	patch \|	diff1 \|	diff2 \|	blob \| history
Koha/Calendar.pm	patch \|	diff1 \|	diff2 \|	blob \| history
members/moremember.pl	patch \|	diff1 \|	diff2 \|	blob \| history