Merge remote-tracking branch 'translate/3.12.0-translate' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 18 May 2013 16:02:54 +0000 (12:02 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 18 May 2013 16:02:54 +0000 (12:02 -0400)
commitbdf193691200e33170c12a3396e881cd22bf94a1
treebdc5a8499509f25da7a83667931f86afb1ec6570
parentbde4a50a841f656d9baf747a2ff05a6726b8b7c3
parenta7dd6850903301e5282c13e44a836408943d19d3
Merge remote-tracking branch 'translate/3.12.0-translate' into 3.12-master