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)
1  2 
lib/accesslib.php
lib/moodlelib.php

Simple merge
Simple merge