Merge branch 'bug_8220' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)
commitaa00c3a6935b49b328969ad910a1e8363e678173
tree24da5e96c7dd1f6fda8cc4b00d522c9a40dacbcc
parent0fe805b5432a3cebd46ec917f1aa768b3a941fa4
parentd4afa2d510c84737d3027d7a8f25cf5480897263
Merge branch 'bug_8220' into 3.12-master