Merge branch 'v3' into Av2

Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js

CHANGELOG.md

@@ -1,3 +1,7 @@
+detharonil
+- Support for %Y in time formatting
+- More future-proof %y
+
 ### 1.1.9 - 2013-05-02
 seaweedchan
 - Fix boards with previously deleted archives not switching to new archives 

LICENSE

@@ -59,6 +59,7 @@
 * WakiMiko
 * btmcsweeney
 * AppleBloom
+* detharonil
 *
 * All the people who've taken the time to write bug reports.
 *

src/General/html/Settings/Advanced.html

@@ -33,7 +33,7 @@
   <div>Supported <a href=//en.wikipedia.org/wiki/Date_%28Unix%29#Formatting>format specifiers</a>:</div>
   <div>Day: <code>%a</code>, <code>%A</code>, <code>%d</code>, <code>%e</code></div>
   <div>Month: <code>%m</code>, <code>%b</code>, <code>%B</code></div>
-  <div>Year: <code>%y</code></div>
+  <div>Year: <code>%y</code>, <code>%Y</code></div>
   <div>Hour: <code>%k</code>, <code>%H</code>, <code>%l</code>, <code>%I</code>, <code>%p</code>, <code>%P</code></div>
   <div>Minute: <code>%M</code></div>
   <div>Second: <code>%S</code></div>

src/General/meta/banner.js

@@ -59,6 +59,7 @@
 * WakiMiko
 * btmcsweeney
 * AppleBloom
+* detharonil
 *
 * All the people who've taken the time to write bug reports.
 *

src/Miscellaneous/Time.coffee

@@ -56,4 +56,5 @@ Time =
     p: -> if @getHours() < 12 then 'AM' else 'PM'
     P: -> if @getHours() < 12 then 'am' else 'pm'
     S: -> Time.zeroPad @getSeconds()
-    y: -> @getFullYear() - 2000
+    y: -> @getFullYear() % 100
+    Y: -> @getFullYear()