Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)

Trivial merge