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

diff --cc user/index.php
Simple merge