Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Nov 2016 01:51:07 +0000 (09:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:35 +0000 (09:07 +0000)
commit1cc10f3f67c424d288e0b718ef42b28dc0d9ab9a
treed239625c889bce123e565084b9817c5ed773265d
parent0fef835188831cf8bb5dd7ba27fe5f7301c60e77
parentb1f3de579347754e618ed4a5c1bf312c64d5e2a1
Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle