Merge branch 'release/2.5.0' into develop

adhearsion · Mar 5, 2014 · f5931fb · f5931fb
2 parents 22ff4be + 7cb7e6e
commit f5931fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,9 @@
 # [develop](https://github.com/adhearsion/punchblock)
+
+# [v2.5.0](https://github.com/adhearsion/punchblock/compare/v2.4.2...v2.5.0) - [2014-03-05](https://rubygems.org/gems/punchblock/versions/2.5.0)
   * Feature: Support language, sensitivity and minimum confidence on UniMRCP-based ASR on Asterisk
   * Feature: Support sending messages to calls (eg SIP MESSAGE) on Asterisk
 
-# [v2.4.1](https://github.com/adhearsion/punchblock/compare/v2.4.0...v2.4.1) - [2014-03-04](https://rubygems.org/gems/punchblock/versions/2.4.1)
-  * Bugfix: Rayo events should not include their timestamp in comparison. This is not useful in applications, and makes testing more difficult.
-
 # [v2.4.2](https://github.com/adhearsion/punchblock/compare/v2.4.0...v2.4.2) - [2014-03-04](https://rubygems.org/gems/punchblock/versions/2.4.2)
   * Bugfix: Rayo events should not include their timestamp in comparison. This is not useful in applications, and makes testing more difficult.
 

diff --git a/lib/punchblock/version.rb b/lib/punchblock/version.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "2.4.2"
+  VERSION = "2.5.0"
 end