Merge tag 'v1.2.6' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:20 +0000 (09:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:20 +0000 (09:20 -0400)
commit546788989a60a602f98856719ac26758a45c7920
tree73023cfe06b14655f4a44ddda7c53c3156a34f2a
parent49f964dd0e5de75ffb0403b7409ede9b6f271cf3
parent85baba3b168f288029ebaafde322b7bfb8401891
Merge tag 'v1.2.6' into develop

version 1.2.6