Merge branch 'null_logger' into dev
authorIan Smith <ian.smith@mylookout.com>
Wed, 25 Sep 2013 19:55:45 +0000 (12:55 -0700)
committerIan Smith <ian.smith@mylookout.com>
Wed, 25 Sep 2013 19:55:45 +0000 (12:55 -0700)
commit9ed63d19c5f3559fac84a3e73b655f084ff10776
tree9ad23dd994ce04f507686a60be7034b01f275bc6
parentc0650ea43e7bc8c2c990fb80629e3f90f502f483
parent54c94fab6d8199e7613a43627cfaa0a0cc352142
Merge branch 'null_logger' into dev

Conflicts:
lib/stomp/client.rb
lib/connection/netio.rb
lib/connection/utils.rb
lib/stomp/client.rb