Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:33:52 +0000 (14:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:33:52 +0000 (14:33 -0400)
commit4bed62da3fa0d5e216d5f2891f410057fc831f07
tree6d557931f50a4abf41e4b7cbf23d4bc65e43cc0d
parent4dbde6c0476ebe8739e1117c50a285549bcd18c5
parent37307fa4f87e3396bc509f4e195fb114571e1364
Merge branch 'hotfix/1.0.4'