Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 08:41:20 +0000 (09:41 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:21 +0000 (10:19 +0100)
commit14c5b3a23fcf9460adf14ae3b4a3286f41e4e27c
treeda5de58ff2b735a3922b863450fa8db84b2abe5a
parentb083e0f6f2c306337d7418238b74aeb3245360c1
parentc8b4b67a2fc9599690deef5bb67a4aa15b8df5c2
Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle