Merge tag 'v1.2.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:18:06 +0000 (11:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:18:06 +0000 (11:18 -0400)
commit7a121285e0d32a0ea6cce92a8f117423931628ff
tree355bbbe25d92cd751e110d84b3bcceb1e0937015
parentdafe30bc1e013a9329e176f4fd4662897da58f99
parent550e77e2f420c9a6710d55d5a549a53897819672
Merge tag 'v1.2.6' into develop

Version 1.2.6