Merge branch 'bug_9617' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:07:06 +0000 (12:07 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:07:06 +0000 (12:07 -0500)
commit558acf88b0aebd91f60d40e9adadfcb4c8687954
tree1c5aa9be77f6bf91e51ac04cb0190b1835db9f1d
parent4fc65c47a1c40dde589ebc14c7d45f81b5438292
parentcb6d604e916517d3f3c20bb106b957afa3175aec
Merge branch 'bug_9617' into 3.12-master