Merge branch 'bug_9587' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)
commit5f40f3f0e424646bbfd4fa8a9f472b06d8124606
treef57aa5cfc6ea55d9ae568badfd1f4009327b5a49
parentc644598a04074bc5cadc7b50396533f17351ad12
parent7f08964c9d62efe7730636a9553b4afe444dbbf7
Merge branch 'bug_9587' into 3.12-master