Use depend_on_asset for wysiwyg-color.css file
remove .rvmrc
Merge pull request #85 from cymen/use-depend_on_asset-for-wysiwyg-color-file

Use depend_on_asset for wysiwyg-color.css file
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails
update
new version
README update
Merge pull request #86 from ekremkaraca/readme-update

README update
Change to Christian Sterzl's fork
Merge branch 'master' of github.com:Nerian/bootstrap-wysihtml5-rails

Conflicts:
	README.md
New release
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vendor/assets/javascripts/bootstrap-wysihtml5/core-b3.js.erb
	vendor/assets/javascripts/bootstrap-wysihtml5/wysihtml5.js