Merge branch 'bug_8942' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)
commit4520f68b07bb08c79d42f6f4f04157dc39a0e063
tree09b0805d4384552ded48e9189bb21fadb08fac8f
parent6e13cc1aad8d0523bd06d9f6bfecbae9e524ff6c
parent9a5818c192cb9a7d23ee78936e89446fb163c895
Merge branch 'bug_8942' into 3.12-master