Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 04:04:20 +0000 (12:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 04:04:20 +0000 (12:04 +0800)
commit134b6485e2d0dbdc5d680fb8e3cb164f0bf4504b
tree42fc2172b1306c336f8a4b84ddd01b7edd8f7ebf
parentd7256f3a491b5be95b8b147c25e7c7597fd16dec
parent393890e1682955cbbc73e9f6d7340d97747ca2e1
Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle