Merge branch 'sobol-templates-hotfix' into release

author Stephen Burrows <stephen.r.burrows@gmail.com>

Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)

committer Stephen Burrows <stephen.r.burrows@gmail.com>

Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
author Stephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
committer Stephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
diff --cc philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
Simple merge
diff --cc philo/contrib/sobol/templates/admin/sobol/search/results.html
Simple merge
author	Stephen Burrows <stephen.r.burrows@gmail.com>
	Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
committer	Stephen Burrows <stephen.r.burrows@gmail.com>
	Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
		1	2
philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html	patch \|	diff1 \|	diff2 \|	blob \| history
philo/contrib/sobol/templates/admin/sobol/search/results.html	patch \|	diff1 \|	diff2 \|	blob \| history