Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:59:31 +0000 (09:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:59:31 +0000 (09:59 +1200)

Trivial merge