Mikael Nordfeldth 0590f2975e Merge branch 'utf8mb4' into nightly ... Conflicts because of urlhash fixes: classes/File.php classes/File_redirection.php classes/File_thumbnail.php		2015-02-19 20:50:40 +01:00
..
Blog_entry.php	Merge branch 'utf8mb4' into nightly	2015-02-19 20:50:40 +01:00