Merge branch 'hotfix/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Aug 2014 12:52:25 +0000 (08:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Aug 2014 12:52:25 +0000 (08:52 -0400)
commit5d196dcedc92f499d968a11517481247646261c8
treef27b7eb1386d6cd3d6878742b01cc986fd11e25c
parent7f5ac515e63f6f16d67c459d8f4458c6878c0187
parent5dbe3676139d0361e23b27bd64c762308b94be72
Merge branch 'hotfix/1.1.3'