Merge branch 'release/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 20:08:09 +0000 (15:08 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 20:08:09 +0000 (15:08 -0500)
commit51d37a9d475b75bd2b99882bfd51dc527cd88143
tree35ce9cb841861ed6d913d5dfac4fa04226529541
parent700548aecfcdaa6f46dce19ad8bb8b27960e9b82
parent21b18df44d715983bba329937c81fe3db8cfff4d
Merge branch 'release/1.2.2'