Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:35 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:35 +0000 (10:12 -0400)
commit7bdda1a4101be3ab32451ccbb3c4553f73385ee8
treeb8cb9b91f8d90bdf876141499d75e613fb24b56c
parent23a74d955f5c5e796ec9b95650d61374f0d28015
parent13b1d5db86dfd1ba44090b4acbd836ee05b51aa7
Merge tag 'v1.2.1' into develop

Version 1.2.1