Merge branch 'MDL-52339-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:45:19 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:45:19 +0000 (00:45 +0100)
commit53c19e00223bb0dff4a231efa9c40083358bcc26
tree87b0cec0172cc6c531a4274ebcb25a531ae55d50
parentde0a98f8ef6a02f45b0ea7b6152d1dbeb5ebc5cd
parent650c0086f9347dab9ecb8adcc9281c68fb1d616e
Merge branch 'MDL-52339-master' of git://github.com/andrewnicols/moodle