Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:41:03 +0000 (11:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:41:03 +0000 (11:41 +0800)
commit674de8e51e15a8f686ae4fabdaa5c6b51a75d2d4
treea50479eee509c6d80c96adf7852fea4e75a5b118
parent5a766a9e2111f5098faf35f46beac2cacc1835d4
parente71061a22b5bc3646fbb0ec515628e8c2623f091
Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle