Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)
1  2 
user/editlib.php

Simple merge