Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 04:27:32 +0000 (12:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 04:27:32 +0000 (12:27 +0800)

Trivial merge