Merge branch 'bug_8896' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:50:15 +0000 (08:50 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:50:15 +0000 (08:50 -0400)

Trivial merge