Merge branch 'MDL-27840-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 03:45:58 +0000 (11:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:03 +0000 (09:31 +0000)
commitdc2aa7f9471dee526d9f89734294a9dd878d55d7
treeb258d5ae95c12435f27e8e146caf429ec08a0555
parent46767cc204e1004f58d16a7d1667574913c9afb9
parent949c27a026d2b2276b2a13166e6ed7065b260fea
Merge branch 'MDL-27840-master' of git://github.com/danpoltawski/moodle