Merge branch 'bug_2835' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 13:03:46 +0000 (09:03 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 13:03:46 +0000 (09:03 -0400)
commitf3d5bd5aa6cd6dc65fc840c2cbeeb0916f151661
tree9ccaa6678efd61b581122183286771272d424832
parentd802961ccb58c81946760e5aff28120a105463e3
parent1b3b942409fc87c828491275e7e866eb02d4671a
Merge branch 'bug_2835' into 3.12-master