Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)
commit795150c550f94fc940c4486e889565fd69748732
treebb42210ee6540d2e1e0c5c8ec47d40ba5fc0ee02
parent5c3de4fe5534426cd76d75048d8e48332d98a06f
parent6ae9dbc2aa8fb370d1bc0fbed9ed220f72482d0d
Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle