Merge branch 'bug_8979' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 12:46:38 +0000 (08:46 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 12:46:38 +0000 (08:46 -0400)
commit2f3cf47b829f0adfddf03066c11a9749ac4087e6
tree4ac0d55a352770169be98d048a5bd0f4e343e084
parent84d8cce883afa2b3d2ca54354b221bfee1ca8153
parentc16a80f51fd26644c285653b7f4ad8a3555ab54e
Merge branch 'bug_8979' into 3.12-master