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)
commit76acac80eb8741f2ca113719e4122c3aafdfeec4
tree8ab4453339e3dae75e1c62882c26a65a53e0221c
parent0915860e51b6c25aff9c17107d1274795c4e95b2
parent6670d28fbcd8f4f26a13d0720d7ea84528d1a2ab
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle