Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 2 May 2012 05:52:13 +0000 (17:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 May 2012 05:52:13 +0000 (17:52 +1200)
1  2 
user/externallib.php

Simple merge