Merge branch 'MDL-36233-31' of git://github.com/lameze/moodle into MOODLE_31_STABLE
commit78d40d3e6d997077d33aff0017f2c645751b5b13
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:56 +0000 (30 09:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:56 +0000 (30 09:34 +0000)
treef9e04bde91a818c587f39aa9a3621e0351fbf1ed
parent81e812c6976252436251ea165a06d3cb9034dec0
parentb5c0146072e13aeb384dffc8729f9ecbaadfbcc7
Merge branch 'MDL-36233-31' of git://github.com/lameze/moodle into MOODLE_31_STABLE