Modified to django 1.5
Merge pull request #39 from iraycd/master

Modified to django 1.5
Merge remote-tracking branch 'master/master'

Conflicts:
	PoshCode/paste/templates/base.html
	PoshCode/paste/templates/paste-view.html
	PoshCode/paste/templates/paste.html
	PoshCode/paste/templates/user-pastes.html
	PoshCode/templates/base_error.html
	requirements.txt
no message