Merge branch 'MDL-47243-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Oct 2014 15:14:39 +0000 (16:14 +0100)
commit560b04b408674de93da6c1a3339e506ea59be3fa
treefad94d3f4b977755aa030be2bed2a983d7b746b2
parentb065b569af8396cbe76eed00dd66ab9e6c6ef543
parent3087835ae3531303689885d5c8a9f3e904de8191
Merge branch 'MDL-47243-master' of git://github.com/xow/moodle