Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 16 Dec 2013 01:27:38 +0000 (12:27 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 16 Dec 2013 01:27:38 +0000 (12:27 +1100)

Trivial merge