Merge branch 'MDL-35918-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:42:24 +0000 (13:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:42:24 +0000 (13:42 +0800)
commit853555f9a70717932b0fca06b8ee38e75fad7dcc
tree979a9cd513c50658e733ae910d5eec679a88c298
parentc9830ddbb7891926fc5ee9bc415af8c96af86201
parentf56ae5a7accac40d6f926c1a8024c8ce30a739ac
Merge branch 'MDL-35918-master' of git://github.com/ryanwyllie/moodle