Merge branch 'MDL-41531-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 11:08:25 +0000 (11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 11:08:25 +0000 (11:08 +0000)
commit687a268cbd6d3ad2b7b43008dac1adc4f942329e
treeaa77f3eacd720f42cd739102a8ba2de9e4ba9672
parentb8ebc30cd109ff3eaaf914872aa779e59fb27d36
parentf07bbccb03a148503529a6e0181ebe904b5fd67c
Merge branch 'MDL-41531-master' of git://github.com/junpataleta/moodle