• chatgris's avatar
    Merge remote branch 'crowdint/master' · c3e14049
    chatgris authored
    Conflicts:
    	README.markdown
    	lib/generators/templates/autocomplete-rails.js
    	lib/rails3-jquery-autocomplete/autocomplete.rb
    	lib/rails3-jquery-autocomplete/helpers.rb
    c3e14049