From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 28 Apr 2011 20:13:55 +0000 (-0400)
Subject: Merge branch 'release' into gilbert
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/a2d75eae2cab588a28155b9c901935aa8d664d5f?ds=sidebyside;hp=-c

Merge branch 'release' into gilbert

Conflicts:
	README
---

a2d75eae2cab588a28155b9c901935aa8d664d5f
diff --combined README
index 4a89499,6e47860..cb5f47a
--- a/README
+++ b/README
@@@ -2,11 -2,11 +2,11 @@@ Philo is a foundation for developing we
  
  Prerequisites:
  	* Python 2.5.4+ <http://www.python.org/>
- 	* Django 1.2+ <http://www.djangoproject.com/>
+ 	* Django 1.3+ <http://www.djangoproject.com/>
 -	* django-mptt e734079+ <https://github.com/django-mptt/django-mptt/> 
 +	* django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>
  	* (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
 -	* (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
  	* (Optional) south 0.7.2+ <http://south.aeracode.org/>
 +	* (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
  
  To contribute, please visit the project website <http://philo.ithinksw.org/>. Feel free to join us on IRC at irc://irc.oftc.net/#philo.
  
@@@ -21,7 -21,3 +21,7 @@@ After installing philo and mptt on you
  4. Optionally add a root node to your current Site.
  
  Philo should be ready to go!
 +
 +If you are using philo.contrib.gilbert, you will additionally need to complete the following steps:
 +
- 1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS
++1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS
diff --combined README.markdown
index 22bac1c,349a727..b529ca2
--- a/README.markdown
+++ b/README.markdown
@@@ -3,13 -3,13 +3,13 @@@ Philo is a foundation for developing we
  Prerequisites:
  
   * [Python 2.5.4+ &lt;http://www.python.org&gt;](http://www.python.org/)
-  * [Django 1.2+ &lt;http://www.djangoproject.com/&gt;](http://www.djangoproject.com/)
+  * [Django 1.3+ &lt;http://www.djangoproject.com/&gt;](http://www.djangoproject.com/)
   * [django-mptt e734079+ &lt;https://github.com/django-mptt/django-mptt/&gt;](https://github.com/django-mptt/django-mptt/)
   * (Optional) [django-grappelli 2.0+ &lt;http://code.google.com/p/django-grappelli/&gt;](http://code.google.com/p/django-grappelli/)
   * (Optional) [south 0.7.2+ &lt;http://south.aeracode.org/)](http://south.aeracode.org/)
   * (Optional) [recaptcha-django r6 &lt;http://code.google.com/p/recaptcha-django/&gt;](http://code.google.com/p/recaptcha-django/)
  
 -To contribute, please visit the [project website](http://philo.ithinksw.org/). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo>).
 +To contribute, please visit the [project website &lt;http://philo.ithinksw.org/&lt;](http://philo.ithinksw.org/). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo).
  
  Using philo
  ===========
@@@ -22,7 -22,3 +22,7 @@@ After installing philo and mptt on you
  4. Optionally add a root node to your current Site.
  
  Philo should be ready to go!
 +
 +If you are using philo.contrib.gilbert, you will additionally need to complete the following steps:
 +
- 1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS
++1. add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS