Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
commit792e6059beb21d1090be71bfd3a20f0c6c4fdb25
tree40164abd70262e96fe4438d3dd70939e24f845f8
parent8eb3e1f94f9463708f8b652f012c5ad5931e2b68
parent1de02d62c98d4ab798b2258fa97ecbc9ad4c3e79
Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle
lib/accesslib.php
lib/moodlelib.php