git, stop screwing w/ me and merge!
?
?
Merge branch 'develop'
Merge branch 'release/0.7.9'
Fix path to inc.upgrade.php.
Bump version to 0.7.9.1
Update the readme and changelog files.
Merge branch 'hotfix/0.7.9.1' into develop