Merge branch 'w43_MDL-42381_m26_ole' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 02:05:55 +0000 (10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 02:05:55 +0000 (10:05 +0800)

Trivial merge