Merge branch 'MDL-44264' of https://github.com/merrill-oakland/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 05:40:47 +0000 (13:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 05:40:47 +0000 (13:40 +0800)
1  2 
user/view.php

diff --cc user/view.php
Simple merge