Merge branch 'bug_8660' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 21:39:37 +0000 (16:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 21:39:37 +0000 (16:39 -0500)
commitf13b13dc16729a0d5839a47cadd1aeaff3a5fdfb
treecf06545555de2c05fd902eec8e0e592fd796d6d3
parent986a18c82b8cb2af27f96081a1e9ada39999ea58
parentdd5ce614aae53032c08cd161eb1d1392a87fdf85
Merge branch 'bug_8660' into 3.12-master