Merge branch 'master' of github.com:edjoesu/clinamen · edjoesu/clinamen@4282104 · GitHub

Commit

Merge branch 'master' of github.com:edjoesu/clinamen

Browse files

Conflicts:
	filelist/models.py
	filelist/views.py
	htroot/filter.htm
	urls.py

Loading branch information

unknown authored and unknown committed Aug 31, 2011

2 parents 7d64f22 + e6c81c0 commit 4282104