Merge branch 'bug_7368' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 22:33:47 +0000 (18:33 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 22:33:47 +0000 (18:33 -0400)
commitf4eacc2da29981c258d4256071e3fc62d2e2d4ab
tree063fc99c576456fdb4e052c6e9cf310d03e51166
parent22415bc7333727c5dcc7639ce24bce00a917e25b
parent7575a8eb8f7d69a80f5c71b6a6de1415b024b7a2
Merge branch 'bug_7368' into 3.12-master