Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:59:06 +0000 (10:59 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:59:06 +0000 (10:59 +0100)
commitc56d14be37b3f675164c8310249a1248fd36c1d4
tree8f837391d49d2af4f47ce956b5d2fcbec799a9a3
parent71dadd6d26148c82901025203032c73746e57f57
parent505ce88467ca9eafeb2469e10afe87b77d7fb718
Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle