Merge branch 'merge_article' of github.com:olluch/typo into temp_rebase
Merge branch 'merge_article'
    Rails version updated to version 3.0.20
          Required action to patch Rails from a critical vulnerability
Merge branch 'master' into merge_article