Merge branch 'MDL-50459-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE
commit9b7d060c5ea7b811af27164396de82731cba0579
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jun 2015 08:04:56 +0000 (15 16:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jun 2015 08:04:56 +0000 (15 16:04 +0800)
tree48ec8af989b6267d1add7b3e596b3cbeaf225453
parent81de8dc4c1281ba76721ed10c1648e019db33ce3
parent346cd4085939ded1d1b7beb95a97d89667543356
Merge branch 'MDL-50459-28' of git://github.com/jleyva/moodle into MOODLE_28_STABLE