{"ref":"refs/heads/rails3.1","push_id":55234541,"commits":[{"sha":"646be88ca37c84225203d11476b9c291216cc4f7","author":{"email":"c83ec6c7d8cd7e4bfbb5654cc3557de4eebcea26@gmail.com","name":"John Tjanaka"},"url":"https://api.github.com/repos/thawatchai/knowledgevolution/commits/646be88ca37c84225203d11476b9c291216cc4f7","message":"Merge branch 'master' into rails3.1\n\nConflicts:\n\tGemfile.lock\n\tapp/metal/obsolete_url_redirects.rb\n\tapp/models/media/file.rb\n\tconfig/routes.rb\n\tspec/controllers/media/files_controller_spec.rb"}],"head":"646be88ca37c84225203d11476b9c291216cc4f7","size":1}