Skip to content
Browse files

Merge branch 'release/0.5.4' into develop

  • Loading branch information...
2 parents 3915f83 + 1641ced commit 2a44a697e362bd09707037cfb7da4337205b6845 @benlangfeld benlangfeld committed Aug 11, 2011
Showing with 7 additions and 1 deletion.
  1. +6 −0 CHANGELOG
  2. +1 −1 lib/blather/version.rb
View
6 CHANGELOG
@@ -1,3 +1,9 @@
+v0.5.4
+ Bugfix(fyafighter): Regression related to earlier refactoring: https://github.com/sprsquish/blather/issues/53
+ Feature(fyafighter): Make it much easier to allow private network addresses
+ Bugfix(benlangfeld): Fix the Nokogiri dependency to the 1.4.x series, due to a bug in 1.5.x
+ Bugfix(zlu): Replace class_inheritable_attribute with class_attribute because it is deprecated in ActiveSupport 3.1
+
v0.5.3
Feature(benlangfeld): Add XMPP Ping (XEP-0199) support
View
2 lib/blather/version.rb
@@ -1,4 +1,4 @@
module Blather
# Blather version number
- VERSION = '0.5.3'
+ VERSION = '0.5.4'
end

0 comments on commit 2a44a69

Please sign in to comment.
Something went wrong with that request. Please try again.