Merge branch 'bug_9690' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:21:55 +0000 (19:21 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:21:55 +0000 (19:21 -0400)
commit54fa7d444c65c8a588469aa6762ea792dbc69099
tree0fa771f435776562d9c8ac60e3350393bdd59329
parentb845731c0e1f295090631bf56747e00b1f5eb89d
parent8b7c8cdecb203ef3c0956162f8ef69ecf27acee5
Merge branch 'bug_9690' into 3.12-master