Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 24 Apr 2015 03:38:07 +0000 (11:38 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:20 +0000 (10:19 +0100)
commitb083e0f6f2c306337d7418238b74aeb3245360c1
tree1c6221b762ea7a5b8005a39811c850bc819db0a2
parent0264bb1ecbc9e88995ad536000ed3a68efbabf9a
parent28d27e85d70614cb69458cde3973c9729096fc11
Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle