Commit graph

1 commit

Author SHA1 Message Date
Samuel Clay
594ce3c469 Merge branch 'master' into social
* master:
  Saving last used recipient email address as a cookie.

Conflicts:
	assets.yml
2012-01-16 10:38:29 -08:00