Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 03:59:03 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 03:59:03 +0000 (11:59 +0800)

Trivial merge