From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 13 Apr 2011 20:29:29 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~15
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/8a7ab75997519a2e99d8a1bf7218af016eaf187d?ds=sidebyside;hp=8a7ab75997519a2e99d8a1bf7218af016eaf187d

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Added 1.2.X compatibility to shipherd LazyNavigationRecurser.
  Minor tweaks to sobol result handling.
  Minor corrections and improvements to sobol.
  Added crude double-import detection to search registration. Added Django 1.2 fallback to SlugMultipleChoiceField formfield method.
  Fixed a sobol bug which was causing search views to always use all available searches. Added some help text to the ajax api boolean.
  Modified the get_start and get_end methods to return datetimes if times are specified.
---