Merge branch 'bug_9669' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)
commit4f0191e1879934ebeeee81851357999722ff2ad6
tree09200ec14adda2197aa07a9df59f8c9e3fddfc7a
parent7141dada5e675db25f955e93ae2d7a12fad39ef0
parent495ff79239cd7b907654dd33ab2dce7990d62f9c
Merge branch 'bug_9669' into 3.12-master