Merge branch 'MDL-56402-master' of git://github.com/lameze/moodle
commit3a24b255baf11520ea705b302f974f532783beb6
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:24:57 +0000 (1 21:24 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:24:57 +0000 (1 21:24 +0000)
treecac3a9c62716520e0af111d1b242317ceb2d4903
parent20fd5e538c8ce44411bfe2f9563d2d35120ee8f6
parent67c89858aac9971eaa39cfac2458b1d946e6f712
Merge branch 'MDL-56402-master' of git://github.com/lameze/moodle