Merge branch 'sobol-templates-hotfix' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
commit943e8bc4af0c11b0ace3811199e3b0844c4c3fbc
treec8a0395d3f117c354b3e883732b9b33b5d7b9a19
parent54b897cf7eb8b3840b7b53d355d6db6462002b28
parent252fcb23a8b86b88db639ef2c3bf5dd9c0c2f3ae
Merge branch 'sobol-templates-hotfix' into release
philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
philo/contrib/sobol/templates/admin/sobol/search/results.html