Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 28 Jul 2014 08:00:48 +0000 (16:00 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 28 Jul 2014 08:00:48 +0000 (16:00 +0800)
commit68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2
treeac3350dac8bf275b4438042caaa7f1c90b95db90
parent62d61619e80523e13b6f570fd9e130659c0a0d2e
parenta9e05f49dbf316b3cd55e26c581ab1aa78558845
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle