Merge branch 'MDL-51222-master-fix' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Sep 2015 03:43:15 +0000 (11:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Sep 2015 03:43:15 +0000 (11:43 +0800)
commit3678dd00c28cb8fb8d183a2a7c89ac2a88ffb181
tree4757f20c8a909726251cb697e7d17f7078ea2700
parentb8ceed62d2f543a12daef265455e73b470157700
parent57884502bca411c25a016411905545cd63a9f891
Merge branch 'MDL-51222-master-fix' of https://github.com/andrewnicols/moodle