Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2015-01-06 19:48:53 +00:00
commit 5cf45c4319
2 changed files with 2 additions and 1 deletions

View file

@ -234,7 +234,7 @@ def setup():
except UpgradeDatabaseException:
sys.stderr.write(
"\nFailed to upgrade database.\n"
"Have you followed any instructions in UPGRADES.rst?\n"
"Have you checked for version specific instructions in UPGRADES.rst?\n"
)
sys.exit(1)