Dean Putney 7e7bdc6eca Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge %!s(int64=10) %!d(string=hai) anos
..
devise.en.yml 7e7bdc6eca Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge %!s(int64=10) %!d(string=hai) anos
en.yml 620acffa5a initial commit %!s(int64=11) %!d(string=hai) anos