From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 27 Oct 2010 17:36:10 +0000 (-0700)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~27
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3c9e34c075474c6bff157de0d3a38796ba44b02f?ds=sidebyside;hp=3c9e34c075474c6bff157de0d3a38796ba44b02f

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

* 'master' of git://github.com/melinath/philo:
  Added grappelli inlines for contentlets and attributes which become active if grappelli is installed.
  Corrected NewsletterView add_item method to join a list of author full_names instead of a QuerySet of models.
  Bugfix: corrects erratic TreeModel get_path behavior. Was returning an extra slash at the end of paths with a given root.
  Moved get_subpath and get_reverse_params prototypes into View model.
---