Zixaphir e156cc8e9c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
2013-12-16 14:01:47 -07:00
..
2013-12-16 14:01:47 -07:00
2013-12-06 17:31:20 -07:00
2013-12-16 14:01:47 -07:00
2013-12-06 17:31:20 -07:00