Merge tag 'v1.0.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:54 +0000 (14:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 18:11:54 +0000 (14:11 -0400)
v1.0.11


Trivial merge