Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 01:18:49 +0000 (14:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 01:18:49 +0000 (14:18 +1300)

Trivial merge