Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:35:34 +0000 (11:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:35:34 +0000 (11:35 +1200)

Trivial merge