Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 06:17:34 +0000 (14:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 06:17:34 +0000 (14:17 +0800)

Trivial merge