From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Sat, 4 Jun 2011 05:09:48 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~7
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/d1dfe30baf0d5ad52107d26de23e11c7c10d0847?ds=sidebyside

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

* 'master' of git://github.com/melinath/philo:
  Added a tutorial for Shipherd and made some minor doc improvements.
  Minor correction to BlogView urlpatterns.
  Added SlugTreeEntity to models.base.__all__.
  Added 'unique' check to SlugTreeEntity for cases where the parent is None. Set tagCreation to create a tag if there are none left to move over.
---

d1dfe30baf0d5ad52107d26de23e11c7c10d0847