Merge branch 'master' into v3

This commit is contained in:
Nicolas Stepien 2012-10-17 10:55:23 +02:00
commit fe52d5fcd2

View File

@ -20,7 +20,7 @@
// @icon https://github.com/MayhemYDG/4chan-x/raw/stable/img/icon.gif
// ==/UserScript==
/* 4chan X Alpha - Version 3.0.0 - 2012-10-13
/* 4chan X Alpha - Version 3.0.0 - 2012-10-17
* http://mayhemydg.github.com/4chan-x/
*
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>