Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:35:38 +0000 (13:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:35:38 +0000 (13:35 -0400)
commit480c020e23f04c9fecec24e74a317ac9205f5042
treed316378c82edae297d12e1a14b4e73db921d0275
parent7aaec32ea1549fbff911c899ba120a9f94b77dcc
parentb9d801cb595ba30aeb68f4c554e5795c67e63eef
Merge branch 'hotfix/1.0.2'