Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 09:45:27 +0000 (17:45 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 09:45:27 +0000 (17:45 +0800)
1  2 
course/externallib.php
enrol/externallib.php

Simple merge
Simple merge