Merge branch 'bug_6680' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:31:25 +0000 (08:31 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:31:25 +0000 (08:31 -0500)
commitbfb67119ce4fdf09a83bc865f68dededa7bdb7cd
tree7e42696f94e49b0b41cd92d8453b261526a86440
parent17ee9d3afb929886416c26e463b5059d8ad542d7
parente7954504f3d8e138cf385604617bd88711717df6
Merge branch 'bug_6680' into 3.12-master