Merge branch 'hotfix/1.2.1' v1.2.1 v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:47 +0000 (10:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:47 +0000 (10:21 -0400)
commit061ed67d72e101263eea00feb9324b75269028f6
tree31aabe9a31b0596e463e666dd6d782ad6d3b0eae
parente71d8992eed2837ed22c53e36281cecbed8815ee
parent22299afae9eacb754abab9c4dcfb67a32fda5b23
Merge branch 'hotfix/1.2.1'