Merge branch 'bug_9674' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)
commit74e9221ba13d05130fd18189fb947328e13f4ba4
tree5d1391371f96d03b3c547cf86448cf40892446bf
parent3aac90419ef41c7807bd27bd1349b66ca303bc1c
parent36aa22d3c80f0d25e59950399ed3464ff2ef0542
Merge branch 'bug_9674' into 3.12-master