Merge branch 'master' into jch-minitestify

Conflicts:
	net-ldap.gemspec

Author: mtodd

.travis.yml

@@ -2,9 +2,11 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
   - jruby-19mode
   - rbx-19mode
+  # - rbx-2
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-script: bundle exec rake spec
+script: bundle exec rake

Manifest.txt

@@ -29,7 +29,6 @@ lib/net/ldap/version.rb
 lib/net/snmp.rb
 net-ldap.gemspec
 spec/integration/ssl_ber_spec.rb
-spec/spec.opts
 spec/spec_helper.rb
 spec/unit/ber/ber_spec.rb
 spec/unit/ber/core_ext/array_spec.rb