Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:21:04 +0000 (12:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:21:04 +0000 (12:21 +0800)
commitb277230aadc917693d9c03871e001ea5ad535daf
tree5643a52a5177f6bba3ea8c59c3cd8e6f966fbd87
parentbfa4c3f3587bc7fe6d02eb4672de3ded751348a0
parent25a66af722cb145f6f5d65468c3020456ee30cf0
Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle