Merge branch 'bug_9017' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:10:59 +0000 (14:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:10:59 +0000 (14:10 -0500)
commit86dfc69e8e84fd3d5f8a2a84e0c49e9c944ead9d
tree3e48163e5c3d054594142b6698e5b99d63e31c65
parentaf02e22ce565531dcc3893089b28ab8c85f7ebb9
parentabf72944ddb5f60e4f94d13682890f20e4c29832
Merge branch 'bug_9017' into 3.12-master