Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 20:52:45 +0000 (09:52 +1300)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:03:15 +0000 (12:03 +0000)
commit6c4e70a6d8e35c7f3a566b31f29adb07deb203ad
treebd96e6e1b2ab9ad026ab3a8706f1ddec1fb86810
parent50944630bd707e452dd9bae3b1bc0b69d83e8461
parent1d658535b66c683bcd5cd2fe2c066f8e02d74505
Merge branch 'wip_MDL-47830_m29_pwrotation' of https://github.com/skodak/moodle
lang/en/admin.php
lang/en/auth.php
lib/db/install.xml
lib/db/upgrade.php