Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 05:43:13 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 05:43:13 +0000 (13:43 +0800)
commit5584adfe70a7e5d3314f715c1b13b3fca586228b
treeaf1c8d4d4fa22da55dc00c45c9c115db96d02b50
parentcce01b49c1180c7dcfc5822e66d27ba943c8c0b3
parentf111746140fe80a821ae69e3bf518d950bf188a1
Merge branch 'w22_MDL-39688_m26_etag' of git://github.com/skodak/moodle