Merge branch 'bug_6898' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)
commit2e5198ea47342e592ae437bdaf2dd79c96a9eaef
tree52e524b587f4df891aff9ca0106f5d3939f8f499
parentefd78bf3744269d51909ccc66bb21e60d6b25d31
parentffc8076d1ac9de7ce8a1b3a525797366b3f7fea1
Merge branch 'bug_6898' into 3.12-master