Merge tag 'v1.1.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:36 +0000 (12:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 17:20:36 +0000 (12:20 -0500)
v1.1.0


Trivial merge