Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)
commit8a4658060340ec5163c9f8d668af1a02044390e0
treea2e48043a044fe28604363fa3ebc55235008853d
parent62d34a4af2828269d7c9ec3305fedcfb9419bd87
parentdef383943bacee8eb44d54e32191109f13f6592c
Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle