Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:56:03 +0000 (12:56 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:56:03 +0000 (12:56 +0000)
commit5d5e545fc78b9e5d9fe26265675e11d1d5675430
tree8f7c670ccf0568babd9b24a7ced1a4e59f03c1e2
parentb373c3507129e09c961be011c82f0349981c41d6
parent8744529ff618b3db3757e10ac49593063cc0e91e
Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle