Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 12:59:30 +0000 (13:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 12:59:30 +0000 (13:59 +0100)
commitc17dc4347ef3a87e2f4a6e09ceda6c1e6ec741a5
treee4d6952946e00ffd80a706506726d88d35cda200
parent774906fc6d70d49f499c4f82fb2ec283e00768f9
parent28e31ae43f1f3402b4a3f83c3fa922fd9b1af0e4
Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle