Merge branch 'bug_9679' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 13:58:04 +0000 (09:58 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 13:58:04 +0000 (09:58 -0400)

Trivial merge