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)
1  2 
user/lib.php

diff --cc user/lib.php
Simple merge