Merge branch 'MDL-50182' of git://github.com/stronk7/moodle
commit62bf94655e00c5387e07c0d845475f468362cc20
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 00:07:04 +0000 (16 08:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 00:07:04 +0000 (16 08:07 +0800)
tree5bc79f085dd32ab717319e73766c82e7575d8b9d
parent66a582d0b3136d0220bb3863e61bcdd53162b734
parentca09f076f8475b166e21c779f624b742292c7b06
Merge branch 'MDL-50182' of git://github.com/stronk7/moodle