Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 03:10:18 +0000 (11:10 +0800)
commitde3e0d20bd0205442d5869861b8401c241fbafd7
treeb4838b585eddce9d960a83a06f2359f2b8362762
parent8d8e6f9607bbbc66d8d4bf2ee273f4de849387e6
parent95cf93b9f4194d7489ea95efa28b523dd2b83411
Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle

Conflicts:
enrol/self/db/upgrade.php
enrol/self/db/upgrade.php