Merge branch 'bug_9024' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:14:15 +0000 (14:14 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:14:15 +0000 (14:14 -0500)
commitc085b9eb919f65010a866136f865d498fd03a5b1
tree401429b6250a3b0af13c575f43b1c195e5b53451
parent86dfc69e8e84fd3d5f8a2a84e0c49e9c944ead9d
parentf5703f8bc7665fa6a7c3a81bac3480c8fdb94b70
Merge branch 'bug_9024' into 3.12-master