Merge tag 'v1.2.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:32 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:32 +0000 (13:06 -0500)
v1.2.11


Trivial merge