Branch: refs/heads/master
Home: https://github.com/mikemintz/deme

Commit: cc09eeba306c5a4a484981643fbf19ad22c55fd5
https://github.com/mikemintz/deme/commit/cc09eeba306c5a4a484981643fbf19ad22c55fd5
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-09-05 (Mon, 05 Sep 2011)

Changed paths:
M deme_django/modules/poll/models.py
M deme_django/modules/poll/templates/poll/approvenpoll.html
M deme_django/modules/poll/views.py

Log Message:
-----------
Merge branch 'master' of github.com:mikemintz/deme


Commit: d1cdc7831b97e453846947ba1b7c230e68788e45
https://github.com/mikemintz/deme/commit/d1cdc7831b97e453846947ba1b7c230e68788e45
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-09-05 (Mon, 05 Sep 2011)

Changed paths:
A deme_django/modules/project/__init__.py
A deme_django/modules/project/migrations/0001_initial.py
A deme_django/modules/project/migrations/__init__.py
A deme_django/modules/project/models.py
A deme_django/modules/project/static/exportguide/gcal1.png
A deme_django/modules/project/static/exportguide/gcal2.png
A deme_django/modules/project/static/exportguide/ical1.png
A deme_django/modules/project/static/exportguide/ical2.png
A deme_django/modules/project/static/exportguide/ical3.png
A deme_django/modules/project/static/exportguide/webmail1.png
A deme_django/modules/project/static/exportguide/webmail2.png
A deme_django/modules/project/static/exportguide/webmail3.png
A deme_django/modules/project/static/jscalendar/calendar-en.js
A deme_django/modules/project/static/jscalendar/calendar-setup.js
A deme_django/modules/project/static/jscalendar/calendar-win2k-cold-2.css
A deme_django/modules/project/static/jscalendar/calendar.js
A deme_django/modules/project/templates/project/project.html
A deme_django/modules/project/templates/project/project_dependency.html
A deme_django/modules/project/templatetags/__init__.py
A deme_django/modules/project/templatetags/event_extras.py
A deme_django/modules/project/urls.py
A deme_django/modules/project/views.py

Log Message:
-----------
Changed name of RecProj to straight Project


Compare: https://github.com/mikemintz/deme/compare/6ce709b...d1cdc78