Merge branch 'MDL-52127-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 01:05:53 +0000 (09:05 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:05 +0000 (09:04 +0100)
commitbb15b62ce8d285b6ce76ab63ff2075c07e8e6ad6
treeaff1420a0b4c2c245ad92573c62cd28657e6478c
parent860f76e11ed7436c589b0e95312ad8a2c575f6bf
parentb18478b935602e4b2c1b61ac807654e3ba714d1e
Merge branch 'MDL-52127-master' of git://github.com/danpoltawski/moodle