AngelinaBelle/SMF2.1 — pull request #1 by AngelinaBelle (2014-06-17 19:24:59+00:00)
Title: Merge two different changes to upgrade.php

Signed-Off-by: Angelina Belle