Merge branch 'MDL-54559-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 06:15:27 +0000 (14:15 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:08 +0000 (09:04 +0100)
commit168b1d98851ca6295474aabe6e0d6563ef6f21e2
tree65482874a2ee42e76cf5e9ca8bbbc698d28814c6
parent45a0932a9e2cefb8783cccaf78e4d3e2391b1003
parent677650c3271b55c55a617ace46553bd28ae912dc
Merge branch 'MDL-54559-master' of git://github.com/junpataleta/moodle