Merge branch 'hotfix/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:36:29 +0000 (12:36 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:36:29 +0000 (12:36 -0400)
commit5d92f719c20628483518a08a00ee53b12c473c7b
tree2996ae4de0e5f569cf8d8375478eac08b6423cbc
parent14d1ae374d98e2cd0bb2f6958a9137a765da223b
parent59c1973e4c8943af516d2ad56bc779dd864bd723
Merge branch 'hotfix/1.0.5'