Merge branch 'MDL-29987' of https://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:13:17 +0000 (10:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Sep 2013 22:13:17 +0000 (10:13 +1200)

Trivial merge