Merge branch 'MDL-57287-master' of git://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:19:22 +0000 (12:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:19:22 +0000 (12:19 +0000)
commit1342a1c60518394f266db264ecae3510daa0b7bf
treeb75c9c46bc238eb54b422ef44965f955ccb35fb4
parentd602810fd547bcae9fecd871416d5b07d4f97fba
parentb167b415a3359c90c673a3a6e598e897670dbc1f
Merge branch 'MDL-57287-master' of git://github.com/snake/moodle