Add the possibility to specify a custom LDAP filter
Add some ducomentation
add license information to gemspec

This way it can be used with rubygems.org API
gitignore Gemfile.lock

The Gemfile.lock shouldn't be included in a gem-based repository
because it may artificially lock obsolete gems.

An example of this is rb-fsevent which at the version it was
locked at is incompatable with OS X 10.8

If something does need the version locked, specify it in the
.gemspec or Gemfile itself.
Update net-ldap
Add two missing commas to example code
Merge branch 'map-userinfo-fix' of github.com:syndicut/omniauth-ldap into syndicut-map-userinfo-fix

Conflicts:
	spec/omniauth/strategies/ldap_spec.rb
removed the rspec deprecation.
Merge pull request #25 from jordimassaguerpla/master

add license information to the gemspec
Merge pull request #28 from docwhat/gemfile_lock

gitignore Gemfile.lock
Merge pull request #30 from leoasis/master

Update net-ldap gem to avoid errors with some LDAP Servers
removed the @url variable and construct_uri method
Merge pull request #32 from rcsheets/master

Minor documentation fix
increased the version to 1.0.4
Merge branch 'master' of github.com:intridea/omniauth-ldap
Merge branch 'master' of github.com:webagecorp/omniauth-ldap into webagecorp-master

Conflicts:
	README.md
	spec/omniauth/strategies/ldap_spec.rb
Add rake to gemfile and replace debugger with byebug
Merge branch 'teambox' into foo

Conflicts:
	Gemfile.lock
	omniauth-ldap.gemspec
	spec/omniauth/strategies/ldap_spec.rb
Merge pull request #2 from teambox/feature/rebase-upstream-master

Feature: Rebase upstream master