Merge branch 'wip-MDL-48569-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 04:25:44 +0000 (12:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 04:25:44 +0000 (12:25 +0800)
commit81103d1d678e175f0676ee602ba982f54ab949f0
tree5068c557ac31ffb43489032a2868a27e1137e022
parente064c375505136a5399117504d40b34e9cba6d69
parent5d9204af46ffa94418a4205a6ca513934ca5ad71
Merge branch 'wip-MDL-48569-master' of git://github.com/marinaglancy/moodle