Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 00:23:25 +0000 (08:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:14 +0000 (09:04 +0100)
commit5869e4b74fa7d4d07b879c49453b1861bfda12cc
tree321b51190702cfdf17142cb18e2317a18adffb6c
parent0fd08fc7e52519077cccd926471e6f53a5a96b1c
parent9c6a38063bc01dde98215416ab510ed8034f0b89
Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle