Merge branch 'MDL-46979' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Sep 2014 23:48:41 +0000 (01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Sep 2014 23:48:41 +0000 (01:48 +0200)
commit8e12ce67da161eb7dc6a0ac4ef81b713a9c2ff72
treedb32094462ea78939319e7c0a33716a6b8d6e64b
parenta46d0e11c0fa08055e5cbe3e6dc58c6853055a79
parent5ff815508f2284af849c99f9c2b2ffa015794a70
Merge branch 'MDL-46979' of git://github.com/timhunt/moodle