Merge branch 'bug_9436' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:24:34 +0000 (19:24 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:24:34 +0000 (19:24 -0400)
commit8447aeccdbe10e3586c9707bb6a99a3e47d9908f
tree676c28e2460ab3b6f599e52bc0a508b9ff5b3d74
parentce8b90e4831ea3404c67628aec2b580bf3489137
parenta2f9346f1d2858bd87d68593b39bd8775b1731b8
Merge branch 'bug_9436' into 3.12-master