I think the above is part of the bill Feinstein keeps in her desk and submits to congress every year.

Feinstein to Introduce Updated Assault Weapons Bill in New Congress, December 17, 2012
Feinstein Statement on Connecticut School Shooting, December 14, 2012

Summary of 2013 legislation

Following is a summary of the 2013 legislation:

Bans the sale, transfer, importation, or manufacturing of:
120 specifically-named firearms
Certain other semiautomatic rifles, handguns, shotguns that can accept a detachable magazine and have one military characteristic
Semiautomatic rifles and handguns with a fixed magazine that can accept more than 10 rounds
Strengthens the 1994 Assault Weapons Ban and various state bans by:
Moving from a 2-characteristic test to a 1-characteristic test
Eliminating the easy-to-remove bayonet mounts and flash suppressors from the characteristics test
Banning firearms with “thumbhole stocks” and “bullet buttons” to address attempts to “work around” prior bans
Bans large-capacity ammunition feeding devices capable of accepting more than 10 rounds.
Protects legitimate hunters and the rights of existing gun owners by:
Grandfathering weapons legally possessed on the date of enactment
Exempting over 900 specifically-named weapons used for hunting or sporting purposes and
Exempting antique, manually-operated, and permanently disabled weapons
Requires that grandfathered weapons be registered under the National Firearms Act, to include:
Background check of owner and any transferee;
Type and serial number of the firearm;
Positive identification, including photograph and fingerprint;
Certification from local law enforcement of identity and that possession would not violate State or local law; and
Dedicated funding for ATF to implement registration