Merge branch 'MDL-52649-master' of git://github.com/junpataleta/moodle
commit64858d435c50da341a6fba3445d7751bd01a82fa
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 00:58:29 +0000 (13 08:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 00:58:29 +0000 (13 08:58 +0800)
treee71a2bf5e5feaf600325b4345c6fb103ff000054
parent1be8237d414caaef1fd56f1a3e05ca51f3a4f5a0
parent9488b6f3a46afc3ca06ddf9fbbeacc6a5182c73f
Merge branch 'MDL-52649-master' of git://github.com/junpataleta/moodle
user/index.php