Merge branch 'MDL-34853' of local stronk7 repo.
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 01:41:14 +0000 (03:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 01:41:14 +0000 (03:41 +0200)
(originally w34_MDL-34853_m24_durationsetting @ git://github.com/skodak/moodle.git)


Trivial merge