damnit
Merge branch 'master' of git://github.com/thefinn93/reddit

Conflicts:
	r2/r2/public/static/jquery-1.7.2.min.js
Merge branch 'master' of git://github.com/thefinn93/reddit
Merge branch 'master' of git://github.com/thefinn93/reddit
Merge branch 'master' of git://github.com/thefinn93/reddit
Merge branch 'master' of git://github.com/thefinn93/reddit
Merge branch 'master' of git://github.com/thefinn93/reddit
Merge branch 'master' of git://github.com/thefinn93/reddit
IPv6 support
Merge branch 'master' of git://github.com/thefinn93/reddit

Conflicts:
	r2/r2/lib/utils/utils.py