Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:33:31 +0000 (10:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:33:31 +0000 (10:33 +1200)
commitfd200bc5e548f576fc5dcf89dd5ed6720fb34c88
treecbe6aea3db7ecafb59c6fd94127c0ee415752ab4
parentdd9e2c8d444b614ad6823d5b634be5546d8e872b
parent90e30b965f023a0e784e089c7f9df682f0c7d865
Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle
user/lib.php