Merge branch 'w22_MDL-39688_m23_etag' of git://github.com/skodak/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 05:43:55 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 05:43:55 +0000 (13:43 +0800)

Trivial merge