Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jun 2015 23:56:39 +0000 (07:56 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:10:37 +0000 (07:10 +0200)
commit7512af87d4633e3eaf4cb0b541f013e961512518
tree6dbc0402a0438cfdc83243bcb09e3e019cafbf18
parent28887344d638ae966fe01e78dcc99498be8f1b97
parente9588b7e68954fb908202c94a1f8dc5c17bd72ad
Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle