Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)
commit1147c5a3d4df304b3ef45cba8a9f508b8dc6c136
tree9dd940a49514b1141b98e10f1e977fdcc3cc3b5d
parentfd23f8e7b25e8b346bee8216f6363aa4de8fc43b
parentc7697399d12474131f32cbd8a018fe9499648c50
Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle