Merge branch 'MDL-39363-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 04:17:19 +0000 (12:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 04:17:19 +0000 (12:17 +0800)

Trivial merge