Merge branch 'bug_7455' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 1 Nov 2012 14:31:14 +0000 (10:31 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 1 Nov 2012 14:31:14 +0000 (10:31 -0400)
commit4db3611ee6210d549e5dda5f705a02310c93e500
tree0c543ecac5ddc817de6a680bcfad816455adf4e9
parent9bcc1f909557cdded766f7ec44293238998b884d
parent9b55ebff65971919a539b060b1aa5ba2de4b94c3
Merge branch 'bug_7455' into 3.12-master