Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:39:14 +0000 (08:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:39:14 +0000 (08:39 +1200)
commit0dd46bb851f510ee32b45b1946fe5055711bfa17
treece41683eb4168f6deed81fce3f7f2576adbc7f36
parent4ead3551439b95233f353a9bc8722a768a6dffd8
parent3aaa906b1e2eb0a8c4272f0ba2319a3dda459cb4
Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle