Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)
commit17039178245519ae26ca03846a71acfd64b9d8e5
tree05026ec8851a47896821e9b7da8801c252dccd91
parent56e6d6608a48c3983e093d80bdd064a97d60d892
parent342f1ab28d2145e52780c885b064846bc6a97f2a
Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle