Merge branch 'w41_MDL-28980_m24_expirywarning' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 09:22:22 +0000 (11:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 09:22:22 +0000 (11:22 +0200)

Trivial merge