Merge branch 'wip-MDL-38318_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:47:25 +0000 (14:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:47:25 +0000 (14:47 +1200)
commit0f8d5064f1ac1a783f653cbebb4e4ead5cff9634
treeeef2d05e3c57a2e205390753e94458088155e729
parent0afca44627a78e283a009f1bbb2e73c6f55f5207
parenta5c167486b85b6b821e619d6d8863438546c6669
Merge branch 'wip-MDL-38318_master' of git://github.com/gjb2048/moodle