Merge branch 'MDL-46979_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commita13ae2ac2d646810c680be61fcd1ba3ba909e602
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Sep 2014 23:48:56 +0000 (2 01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Sep 2014 23:48:56 +0000 (2 01:48 +0200)
treec72eedb0c9462d000875a40adca31e75a4d1e33c
parente19f164fc77a4b1c0ec925c7f14c8ef6239df66b
parent9d97806c7e351e71cc2f83debc1b78d37573ea6c
Merge branch 'MDL-46979_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE