Merge remote-tracking branch 'origin/Mirio/credits'
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)

Trivial merge