Added MOODLE_26_STABLE
Tweaked update-submodules() and merge-branch()
Now tracking 2.5 and 2.6
Merge branch 'master' into release