Merge branch 'release/0.5.6' into develop

processone · Sep 23, 2011 · 5888b1b · 5888b1b
2 parents 44fc2c7 + dd4be27
commit 5888b1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,7 @@
-v0.5.5
+v0.5.6
+  Changes from 0.5.5, this time without a bug when using the namespaced DSL approach
+
+v0.5.5 (yanked)
   Bugfix(benlangfeld/kibs): ActiveSupport was overriding the presence DSL method
   Feature(fyafighter): Adds SSL peer verification to TLS
 

diff --git a/lib/blather/version.rb b/lib/blather/version.rb
@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end