Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)
commit96218d0edbdbe7c3b6578ac8a8d72afdaeb037a0
treeb922df24c7b4ef686685a1d6e38c1ca0ca56ac8e
parentb3af3bbb963bcf7e6e526251918022dd82f58826
parent9cc23e26923db426c805068c99468a8124f6860e
Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle