Merge branch 'gilbert' of https://github.com/melinath/philo into gilbert
authorHarris Lapiroff <hlapirof@oberlin.edu>
Thu, 9 Jun 2011 17:19:06 +0000 (13:19 -0400)
committerHarris Lapiroff <hlapirof@oberlin.edu>
Thu, 9 Jun 2011 17:19:06 +0000 (13:19 -0400)
commit9b93dd34886adff50f1415db3a97b09fa1e728fb
tree606676cc3a872f0a55656f6b2cdd3cd43bdaf99c
parent2b607d5a5e948a3399f110bd04583d2213db24ce
parent498decade1893dd840faf3005b02dca22eaa5d14
Merge branch 'gilbert' of https://github.com/melinath/philo into gilbert
philo/contrib/shipherd/templatetags/shipherd.py
philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
philo/contrib/sobol/templates/admin/sobol/search/results.html