Zixaphir 6cc5ac8dd2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 ...

Conflicts:
	CHANGELOG.md
	Gruntfile.js
	LICENSE
	lib/$.coffee
	package.json
	src/banner.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/metadata.js

2013-04-26 00:31:19 -07:00

..

changelog/3.2.0

Changelog.

2013-04-25 01:58:28 +02:00