Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 23:20:16 +0000 (11:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 23:20:16 +0000 (11:20 +1200)
1  2 
course/externallib.php

Simple merge