Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle
commite5728db82963d4035f02c38315d7cb7e48d275ac
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 06:07:27 +0000 (8 14:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 06:07:27 +0000 (8 14:07 +0800)
treead1f8c180164a00df87f9d9468a56ed2a5868c1a
parent1147c5a3d4df304b3ef45cba8a9f508b8dc6c136
parentedf6db654780a75d4d004b136c916aedd1b5bebf
Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle