Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:53:40 +0000 (13:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:53:40 +0000 (13:53 +1200)

Trivial merge