Merge branch 'MDL-38020-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 03:58:24 +0000 (11:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:04 +0000 (09:31 +0000)
commita1013a80548001eeadd5baf3b6c0fa5f525d52d4
tree248ce63fe878169f8bad8829994caa4ffa18ff7f
parentdc2aa7f9471dee526d9f89734294a9dd878d55d7
parentd60ae7323633ca244f689916faa05dbdf03ee7e3
Merge branch 'MDL-38020-master' of git://github.com/danpoltawski/moodle