Merge branch 'MDL-50569-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 30 Jun 2015 01:30:57 +0000 (09:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 30 Jun 2015 01:30:57 +0000 (09:30 +0800)
commitc6a1425ffbe5caca98fbe4b0cdd23aebeddb73dd
tree86e179c83034aa1ad925251c2b0878c5671fbdc2
parenteabbc98c7843904f8303d74030d1cab541d75465
parenteff864e7eb7905ec648eb8ebefe5c645bac0dfe8
Merge branch 'MDL-50569-master' of git://github.com/FMCorz/moodle