Merge branch 'wip-MDL-43606-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commit135634fbd38c905c14fe7819ec749e0a4f5ff2b2
authorDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 06:33:11 +0000 (8 14:33 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 06:33:11 +0000 (8 14:33 +0800)
treecb0f8d4f7d1b64b0a935866216188d5e91117d92
parentd99f765ee6baf125ed8fb7ac541e18e7591fc1c2
parent6f70004a0df5fea32dfd211bb9efce5b6be02605
Merge branch 'wip-MDL-43606-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE