Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)

Trivial merge