Will Daly 342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests ...

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

2013-05-16 11:21:59 -04:00

..

auth

more cleanups in CMS project

2013-04-13 21:13:34 -04:00

contentstore

Merge branch 'master' into feature/will/ci-lettuce-tests

2013-05-16 11:21:59 -04:00

models

Remove system_metadata_fields.

2013-04-29 16:41:07 -04:00