Merge branch 'MDL-57480-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)
commit38425d9fee3dd097cd9f7f4857cb5c3f567649df
treee5a46ccaed6a99d545c2362d1b731c6fcb6f432b
parentb06f33d5cc3950ff196fc62a60fd2b97a1045128
parent865c4f5df9b3763319eb0eaa4625767e2132191f
Merge branch 'MDL-57480-master' of https://github.com/snake/moodle