Merge branch 'bug_9914' into 3.12-master v3.12.00-beta1
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)
commita4f4d69c3b0f82e765b20cdee7be95456ee9db23
tree378255e68134c18d178c9658db23506234af83d9
parent3293434c23dad2298e38dc393ca2e000ef068cef
parentc54e959cade6f9802fada62da535c7e3fbd8f664
Merge branch 'bug_9914' into 3.12-master