Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)

Trivial merge