git.koha-community.org Git - koha.git/commit

author	Jared Camins-Esakov <jcamins@cpbibliography.com>
	Fri, 23 Nov 2012 16:44:26 +0000 (11:44 -0500)
committer	Jared Camins-Esakov <jcamins@cpbibliography.com>
	Fri, 23 Nov 2012 16:44:26 +0000 (11:44 -0500)
commit	ea418af20558801d8ee6bad2e18327e4390df077
tree	becc6f5839e12c1a99bec40901dcab946ca2e38c	tree \| snapshot
parent	e93cc449410f6c8d90b616f3d8e002e9ade4dadd	commit \| diff
parent	2c65bdcdcc735b273dc7479638989da4593368f2	commit \| diff

Merge branch 'bug_2832' into 3.12-master

Conflicts:
kohaversion.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>