Merge branch 'bug_9306' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 02:55:01 +0000 (21:55 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 02:55:01 +0000 (21:55 -0500)
commit518ddc59d020feb6c2661cbf6c0d51703507ca12
treedfbb6ae2646dd33ccf3aa50fed00fc3c4c007413
parentf0adcc8073a95e4c39ddd382f2b13e70765c5065
parentbe356e1a07c4c4ac1cb70696be8a27994516760d
Merge branch 'bug_9306' into 3.12-master