Merge branch 'wip-MDL-10405-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:07:58 +0000 (17:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:07:58 +0000 (17:07 +0800)
commita6cbafb76481207836601a42a24a6da5cfe34595
tree064002c0d15728d234453ffa300b64f3689d5443
parent994bab56ae73aa6605a6190f9c004dad72e279d9
parentbb01883867f3c85ebaa094615ddfadb8c5f1f518
Merge branch 'wip-MDL-10405-master' of git://github.com/marinaglancy/moodle