Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster
* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster: fixed some art, john smith and mime mime W

| W: | H:
| W: | H:


* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster: fixed some art, john smith and mime mime W
11.2 KB | W: | H:
11.2 KB | W: | H:
264 Bytes | W: | H:
267 Bytes | W: | H: