git.ithinksw.org - philo.git/commit

git.ithinksw.org / philo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2fc1835 37f95f6)

author	Stephen Burrows <stephen.r.burrows@gmail.com>
	Sat, 27 Aug 2011 23:04:50 +0000 (16:04 -0700)
committer	Stephen Burrows <stephen.r.burrows@gmail.com>
	Sat, 27 Aug 2011 23:04:50 +0000 (16:04 -0700)
commit	cbbff4f681be1a7a1666424d7c2883dfd4a7c30d
tree	fc84c2df06628e258caaee9ec5c810dd1c243741	tree \| snapshot
parent	2fc183522eed8346ea80c65a4280935a450d6d27	commit \| diff
parent	37f95f6fd3e1da107a0eaf28c516e71206100bf4	commit \| diff

Merge branch 'taggit' into develop

Conflicts:
philo/admin/widgets.py
philo/contrib/penfield/admin.py

README	diff1 \|	diff2 \|	blob \| history
README.markdown	diff1 \|	diff2 \|	blob \| history
philo/admin/widgets.py	diff1 \|	diff2 \|	blob \| history
philo/contrib/penfield/admin.py	diff1 \|	diff2 \|	blob \| history
philo/contrib/penfield/models.py	diff1 \|	diff2 \|	blob \| history

Foundation for web content management systems using Django.