Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 23:28:08 +0000 (12:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 23:28:08 +0000 (12:28 +1300)

Trivial merge