Merge branch 'bug_9256' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 23:34:28 +0000 (19:34 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 23:34:28 +0000 (19:34 -0400)
commitd84af2decb093d487323ca2c11bd65ca57d6eb93
treee62d27eb5f5db42783365c28582655506935e924
parentba22e7daf6bf0344217894e0ac1bad3d6d8022ef
parentbe691769829d236375eaabe51fadf6f366dd3f6b
Merge branch 'bug_9256' into 3.12-master