Merge branch 'bug_7969' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)
commit2b61128842cfdba3d0aa10071a680af377c617c0
tree0d2cda22df579e307b82532b7e3f5f44a9cc4b05
parent9f4069fb8ac37cf6fd9fcc5ebacac5176c31079f
parente362644218d56a5247552e1f29ccf4d0b25f725c
Merge branch 'bug_7969' into 3.12-master