Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Apr 2013 22:38:38 +0000 (10:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Apr 2013 22:38:38 +0000 (10:38 +1200)

Trivial merge