Merge branch 'bug_9604' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)
commitd838626278d3f5ffdcceddb10c859b43ce13ac1c
treeebed2557fd127247bf0be76bc48cb0f55ba40078
parent936b83652c70978555b24b4a23e8663a2eff1684
parentc634aab8d001960615f7a3a6265e87a1696fe42f
Merge branch 'bug_9604' into 3.12-master