Merge branch 'MDL-36233-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:27 +0000 (09:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:27 +0000 (09:34 +0000)
commit9e3df32f5c4292e44d62ed35f46af6ea40cc7c6e
tree7271868b11b8dba7466202fc9628cc7ee039aad0
parent746372776104c548dc67602c52cb24053985265a
parent559cfa03f4a94671cd7b747a5610ace94164a787
Merge branch 'MDL-36233-master' of git://github.com/lameze/moodle