Merge branch 'MDL-46662-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 4 Feb 2015 02:36:42 +0000 (10:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 4 Feb 2015 02:36:42 +0000 (10:36 +0800)
commit89cccc9e0ee7974f9625a30a8c9090ef30754a0c
tree1313fe91b6211b9f652d4bed3a924442970f48bf
parent6cf0aa0127f885a9864d883db256c24d334afe61
parent2350b3f4537f6e59ba21ee597722785a397e3ed6
Merge branch 'MDL-46662-master' of git://github.com/zbdd/moodle