Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 06:14:09 +0000 (14:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Sep 2015 06:14:09 +0000 (14:14 +0800)
commit09fe55f4dec31ab0a0aa3c37f1e0d335c9e51c9b
tree5be7e85c9ccdf74ae4ce35f9a965e1eac2d68398
parent9608bed13336260fc0737ff67d0d649a12ca3235
parent3c3d38d09a9b3ae17ef861effe8423b6ea4ec89e
Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle