Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 07:14:49 +0000 (15:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 07:14:49 +0000 (15:14 +0800)
commit924ea4845ab771a82e9c9e7f09075e3417c885ed
treea9f255811bfa21f930ab13bff7ab826eb7eeb4f3
parent3e2b5734dd0f5c3dfedad02e9bb539fb26e4cad5
parent7809d1557c8233d350b19944c1d55f7c3f23e84e
Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle

Conflicts:
version.php
lib/setuplib.php
version.php