Merge branch 'MDL-38698-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 20:21:50 +0000 (09:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 20:21:50 +0000 (09:21 +1300)

Trivial merge