Merge branch 'bug_6574' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:17:25 +0000 (23:17 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:17:25 +0000 (23:17 -0500)
commit5ea98ade5de972abef5bed82a53518d45c0fcd8a
treefae5e1dfd0f27315f62433d81198e292ff130be4
parentb4e255e4d76600f2580706f71651a02a5608300e
parentf13de4bdb69a3b656730b69059d652b67ea4e3de
Merge branch 'bug_6574' into 3.12-master