Merge branch 'MDL-37634_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 00:44:45 +0000 (13:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 00:44:45 +0000 (13:44 +1300)

Trivial merge