From: Joseph Spiros Date: Wed, 25 May 2011 21:55:26 +0000 (-0400) Subject: Merge branch 'release' of git://github.com/melinath/philo X-Git-Tag: philo-0.9~10 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/886de29e37c1dbfe17a69c65d4aa010a0d60e1c1 Merge branch 'release' of git://github.com/melinath/philo * 'release' of git://github.com/melinath/philo: Minor correction to django-mptt requirements. Upped version information to 0.1rc. Switched from distutils to setuptools and added dependency information and metadata. Added documentation for has_navigation and navigation_host filters. Added examples of Node.navigation use to Navigation docs. Added more human-friendly general docs for shipherd. --- 886de29e37c1dbfe17a69c65d4aa010a0d60e1c1