Merge branch 'patch-1' of github.com:sindresorhus/emscripten into incoming

2 files changed, 3 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index d47b3199..792fb523 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -118,3 +118,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Alexandre Perrot <alexandre.perrot@gmail.com>
 * Emerson José Silveira da Costa <emerson.costa@gmail.com>
 * Jari Vetoniemi <mailroxas@gmail.com>
+* Sindre Sorhus <sindresorhus@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 8749f02f..9d1d85d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,12 +12,12 @@ Current trunk code
  - To see a list of commits in the active development branch 'incoming', which have not yet been packaged in a release, see
     https://github.com/kripken/emscripten/compare/1.8.2...incoming
 
-v1.8.2: 1/4/2013
+v1.8.2: 1/4/2014
 ------------------
  - Fixed glGetFramebufferAttachmentParameteriv and an issue with glGetXXX when the returned value was null.
  - Full list of changes: https://github.com/kripken/emscripten/compare/1.8.1...1.8.2
 
-v1.8.1: 1/3/2013
+v1.8.1: 1/3/2014
 ------------------
  - Added support for WebGL hardware instancing extension.
  - Improved fastcomp native LLVM backend support.