Merge branch 'MDL-47209-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:50:43 +0000 (13:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:50:43 +0000 (13:50 +0800)
commit8b1e5aa4ce7d4f900e9ba6fee52aa7b7a4e1426e
tree03cb93388bb2b5837ed404b8070ee599eba90ad8
parent7214b77a51cfd07039090ae7bc972d3a61962285
parent385de04b10dcd744b96c4b9ae52ab07e3b347b95
Merge branch 'MDL-47209-master' of git://github.com/FMCorz/moodle