Merge branch 'release/1.2.6' v1.2.6
authorIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:00 +0000 (09:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:00 +0000 (09:20 -0400)
commit85baba3b168f288029ebaafde322b7bfb8401891
tree73023cfe06b14655f4a44ddda7c53c3156a34f2a
parent935998ce6cb1eddcd08636379d229847d5a5029c
parent638fbabf7bde5ebde4220e290a337d9656a1afe4
Merge branch 'release/1.2.6'