Merge branch 'hotfix/1.2.6' v1.2.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:39 +0000 (14:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:39 +0000 (14:42 -0400)
commitbfdf8207ffa3c5c7fe4e623924ad972d6cd17084
tree747a58ee08a5804bfd37736fcf8864fc89a9a35b
parent0194c73a8b0d87cf2dd4abb0a222765950eeb4de
parentd181e0c64797175a243f17485e8a65a9debf0644
Merge branch 'hotfix/1.2.6'