Merge branch 'Mirio/credits' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)
commitc9ff5a702ecc45075c8c4671198e23d2c5ca8675
tree884bf64e4481432c8757b993d064097c6c0f3ecb
parentaab7e000924210fc6339724d854eada8e44f8528
parente4cb05af448c40ccd2f5ae6fe0d52eba19155aad
Merge branch 'Mirio/credits' into 'master'

Mirio/credits

Updated credits

See merge request !80