Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)
commit06cdbf8382fc2edd3596d3eada815d0900f83714
tree735fd352a6f3361e6b469a22af8dca50b8e3a94b
parentd1426e2843a9b57145e1494c933290dbea0e3f4e
parentbfa0c3ab4feabe8665144efbae5f441f65e3ef6c
Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle