Merge branch 'bug_9656' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:27:06 +0000 (09:27 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:27:06 +0000 (09:27 -0500)
commitb5094156bddd2098a993ada38e967479bbed5309
tree35cca3c83028e45cc71ad75550f3de0b896ece73
parent3c35d59c334e7e064e491227c36c165c1669b7b7
parentc65b45e3b4309e1965f682dbc9c551cbeaea7189
Merge branch 'bug_9656' into 3.12-master