Bump versions for rails3 (0.2.1 - rails 2.2, 0.2.2 - rails 2.3, 0.3.0 - rails 3.0)
Fixed mkd-extraction artifacts on malformed HTML.
Bumped version to 0.3.1.
Replace all duplicate markdown extractions (tender-#1340)
Revert "Merged from tender."

This reverts commit 4281e514647fbed560bd5908fc8bbd126d9e7672.
Stops conversion of newlines into <br> tags
Bump the gem version
Merge pull request #2 from entp/new_line_breaks

Stops conversion of newlines into <br> tags
Add a Gemfile
Backport changes from the 2.3 branch (TidyFFI)
Merge pull request #3 from entp/backport_rails23_changes

Backport changes from the 2.3 branch
Revert line break changes
Merge pull request #8 from entp/revert_line_break_changes_in_master

Revert line break changes
upgrade to redcarpet, bump version
Selectively merge branch 'master' into rails23. Upgrades rdiscount -> redcarpet (new! shiny!)

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	lib/model_formatting.rb
	test/formatting_test.rb
	test/model_formatting_test.rb