Merge branch 'bug_7687' into 3.12-master
commit0f6487bc32d80ad91cf11627b8aded8b48ab9c71
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 03:18:06 +0000 (29 22:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 03:18:06 +0000 (29 22:18 -0500)
tree201913c6a29b0ef9d825c3aa34319f5713dcdb1f
parenta82e2b9d764e9520ba98063c90854113cf6b16ae
parent90d00a52679b65c6f40de416d1b34a72319759e6
Merge branch 'bug_7687' into 3.12-master