Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 15:18:46 +0000 (15:18 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 15:18:46 +0000 (15:18 +0000)
commit821296dc7b9dca7e926dbeddf7064f582ee5f4cd
tree51d401399da01d5d5d9cd94abd5a8f45bb472dd6
parent0aefe91c50d4edb1051ae99d1dcd065d616571da
parent34edbe5733d13dd66c39e761dec034fdbc327796
Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle