Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 13:09:59 +0000 (14:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 13:09:59 +0000 (14:09 +0100)
commit015b4d22a2583b5f9023998229acf0d5cfd9982b
tree516b19f01f1d5c2d9849343c82654d61de7c0c75
parent5bd52435b4d11ff0deadf6f2cb11b256e31ea7cf
parent72ac2aacfa4b7054b79fac56486f1db147bc9631
Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle