Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:03:21 +0000 (09:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:03:21 +0000 (09:03 +1300)

Trivial merge