Update History.md to show 1.4.2 changes
Merge pull request #249 from yahonda/update_readme_v142

Update History.md to show 1.4.2 changes
don't specify column type in schema dump for NUMBER virtual columns
fix typo
Merge pull request #256 from govdelivery/master

don't dump type for NUMBER virtual columns
Remove `:nls_characterset` and `:nls_nchar_characterset`
from optionals NLS parameters

Oracle does not support change these parameters at session level.
Merge pull request #266 from yahonda/nls_support

Remove `:nls_characterset` and `:nls_nchar_characterset` from NLS optional parameters
Added note about Tomcat Usage

Tomcat requires to set the accessToUnderlyingConnectionAllowed to true in the context.xml file. Otherwise, weird errors pop up (undefined method 'meta_data' for nil:NilClass)
Merge pull request #267 from Xylakant/patch-1

Added note about JNDI Usage with tomcat
Add a testcase for issue #134
Issue #134 :returning_id column should be of type Column.
Merge pull request #274 from yahonda/returning_id_master

Address :returning_id column should be of type Column
Supports table_name prefix/suffix for add_foreign_key

Closes reenhanced/oracle-enhanced#1

LGTM given by: @codenamev

Squashed commit of the following:

commit b1c0fedfca69cde2d20ea362ea738afd422e516e
Author: Nicholas Hance <nhance@reenhanced.com>
Date:   Tue Dec 11 11:16:39 2012 -0500

    typo

commit 6f776e4589a2a0e6873d1d624428db29bfae904d
Author: Nicholas Hance <nhance@reenhanced.com>
Date:   Tue Dec 11 11:07:25 2012 -0500

    Supports table_name_suffix for add_foreign key

commit db3c2655a7717905443348f576e4a278942ce903
Author: Nicholas Hance <nhance@reenhanced.com>
Date:   Tue Dec 11 10:44:34 2012 -0500

    Support table prefix for add_foreign_key
Merge pull request #263 from reenhanced/master

Supports table_name prefix/suffix for add_foreign_key
Make sure versions are dumped in order

There is not any guarantees that versions comes in the same order they
are inserted without ordering them explicitely.
Merge pull request #277 from hiukkanen/master

Migrated versions should be dumped in order
Add testcase #275
always write serialized LOB columns #275
Merge pull request #278 from yahonda/issue275_master

Address #275
Merge branch 'master' into rails4_merges_master_2nd

Conflicts:
	lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb
	lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
	spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

Conflict resolutions:
	lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb
    - `0fdeb26f` and `f50aa48` have been merged to `lib/active_record/connection_adapters/oracle_enhanced_model.rb`

	lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
    - `e897d63` needs ruby 1.9 hash style

  spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb
    - `e897d63` needs ruby 1.9 hash style