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)
commit3178aacd9efdb692c1991af71736ad0e78a21d4d
tree80cecb5130ed8d7cdc774b3dcab8f523e088f931
parent8affd1ca7e433402221cc8d75149a33a2a8220b6
parent8d4f13666b698065311f9ca4948cec541bc0bebb
Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle