From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Tue, 26 Apr 2011 15:59:19 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~14
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b3fd01202e71b1a43ab372b8f19e9ff6f13dae7b

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

* 'master' of git://github.com/melinath/philo:
  Added slug to the context for ajax searches.
  Added search.result_template to the context for search views with ajax enabled.
  Added support for limit_choices_to use in the ModelLookupWidget and switched its output generation from concatanation to array joining. Corrected Page.clean_fields method's handling of the exclude kwarg.
  Added sortable_field_name to the collection member inline for grappelli.
  Set GoogleSearch to allow default args and to default to a search within the current site.
---

b3fd01202e71b1a43ab372b8f19e9ff6f13dae7b