Merge branch 'master' into gilbert
[philo.git] / __init__.py
2011-02-16 Joseph SpirosMerge branch 'master' into gilbert
2010-11-29 Stephen BurrowsMerge branch 'mptt'
2010-11-24 Joseph SpirosMerge branch 'master' of git://github.com/melinath...
2010-11-17 Stephen BurrowsSwitched template loading from Template.loader to philo...
2010-07-02 Kriti GodeyMerge branch 'master' into penfield, cleaned up.
2010-06-23 Joseph SpirosMerge branch 'master' into penfield
2010-06-23 Joseph SpirosMinor cosmetic cleanup of model references following...
2010-06-16 melinathRemerged clone to push to it
2010-06-16 Joseph SpirosMerge branch 'penfield' of git://github.com/kgodey...
2010-06-16 Joseph SpirosMerge branch 'master' into penfield
2010-06-16 Joseph SpirosMerge branch 'admin-cleanup'
2010-06-14 melinathRebased to origin; removed treechanges.
2010-06-14 Joseph SpirosCleaning up imports.
2010-02-01 Joseph SpirosInitial commit.