Merge branch 'MDL-38239-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 06:14:03 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 06:14:03 +0000 (14:14 +0800)

Trivial merge