Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 2 Apr 2014 03:37:19 +0000 (16:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 Apr 2014 03:37:19 +0000 (16:37 +1300)

Trivial merge