Merge branch 'Mirio/credits' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:31:40 +0000 (05:31 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:31:40 +0000 (05:31 +0000)
commitea48961feb50159e05ef56f38b7fd0ebc15cc64e
tree1db25df69332a95e67453ddb3ec0ceb3f984936e
parentb4a0a5ea0f964c0a88877d1903580684ce73f307
parentdd82b2ebbbf30dedda97d49084eaf2e28a4b5907
Merge branch 'Mirio/credits' into 'master'

Mirio/credits

Somehow CuBe0wL got lost

See merge request !92