Merge branch 'bug_8996' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 02:30:30 +0000 (21:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 02:30:30 +0000 (21:30 -0500)
commita1bba47177d086aa804b61a47387a8686b9dca13
tree22ca162ed61a6982c986a7783d12bd933bb24ab6
parent25bc645c16765a597e6639643b7a6dc350bee40d
parent24216136f4cdfe308e165af7450d3471cd8bc98e
Merge branch 'bug_8996' into 3.12-master