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)
commit1b393ce91de546b0082d416dfaf3159a6d6d060b
tree270b2b076c6519eccbffea1ddf768f739bfbef70
parentcf457c216997a8d0a9c7ab9480e84d5ecb54b13e
parentf6343982e17d9dc56612f522149a7e55f0167dcc
Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
user/editlib.php