Merge branch 'bug_7608' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)
commit9d5bdaff0350e23e7fddbe716678a9c228a3ef1e
tree44aec61675def457348e8e6b752252bc46688dd7
parent621be0ccd8cb942bebe9a318f581fcdbdb4a2aa7
parent6d75a4c7144b19684b1ba1864382e35c48fc8951
Merge branch 'bug_7608' into 3.12-master