Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)
commit835a006b070c669352ecfee0c528c8183a24112e
treeef6c20d8c199ec9251ac93b1e5fe16f61e803b82
parent4aac948f346985dc21bcb882ddf2bdff312202ba
parent97b251a352d6a78550df4ece9e241eabbf548021
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle