Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)
commitbfd19d36d6180838f19328efaa9641cbbb549553
tree31aabe9a31b0596e463e666dd6d782ad6d3b0eae
parente6a33b018b04fdef4e1ee0c294c15435ec61a48f
parent061ed67d72e101263eea00feb9324b75269028f6
Merge tag 'v1.2.1' into develop

Version 1.2.1