Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 03:20:39 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 03:20:39 +0000 (11:20 +0800)

Trivial merge