Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)
commitca9e3c5ae205d77e810b4d9aaeff7db5273b6478
treebe132f1755bf912280cda5caebb4a0b67ca55fd8
parent061ed67d72e101263eea00feb9324b75269028f6
parent931d732af64002c6ce95bef3f53e762ecd4cbb44
Merge branch 'release/1.2.4'