Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 02:58:04 +0000 (15:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 02:58:04 +0000 (15:58 +1300)

Trivial merge