Merge branch 'MDL-56696-master' of git://github.com/lameze/moodle
commit77b0bafa6d536f96dbd4b71b2e89530d9a8b07df
authorDan Poltawski <dan@moodle.com>
Mon, 7 Nov 2016 11:33:55 +0000 (7 11:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Nov 2016 11:33:55 +0000 (7 11:33 +0000)
treeb8fa589e46d7ad0b021fbec3e4836736f3cbfc1e
parent13ab169cb74874ad9881d922762e766d605547e9
parentb445f4b342ba0e64b0442912009c85d2892d9e56
Merge branch 'MDL-56696-master' of git://github.com/lameze/moodle