Merge branch 'release/1.0.4' v1.0.4
authorOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 16:27:29 +0000 (12:27 -0400)
committerOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 16:27:29 +0000 (12:27 -0400)
commit3731de7192c768fb8d77c65c79b02f3af2195ccd
tree437bba2902f0304a8c2302a5bbda0cbd7dc1cfe8
parent875383bab3174b97451162d74850a770c9560f3c
parent7ef17483f2ce786fedcca0f428c269e27cdd6c5a
Merge branch 'release/1.0.4'