Merge branch 'v0.4.x'

Conflicts: CHANGES.txt tests/sandbox.py
Yelp · May 24, 2015 · df7a85b · df7a85b
2 parents e4f7475 + 75886e1
commit df7a85b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,8 +1,10 @@
 v0.5.0, 2015-??-?? -- ???
+ * more efficient decoding of bz2 files
+
+v0.4.5, 2015-??-?? -- ???
  * runners:
    * EMR:
      * aws_security_token for temporary credentials (#1003)
- * more efficient decoding of bz2 files
 
 v0.4.4, 2015-04-21 -- EMRgency!
  * runners: