Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:32:41 +0000 (11:32 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:32:41 +0000 (11:32 -0500)
commit75284bbc632c397ce0d018e7e67a7edf6a374787
tree7dc562e76ed96fd03d5b1168fef57aba3fc88410
parent761d17337986370bb5e1ea74a72fc86a368cf323
parent6654cf03bb127f85dbfe1426eb94d008169724f6
Merge branch 'hotfix/1.0.22'