Merge branch 'hotfix/2.1.3' v2.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:25:03 +0000 (16:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:25:03 +0000 (16:25 -0400)
commit54b30f2b6585f8646328d5375fcd2ae1e64dc4b8
tree482395616724fd74b767fa48d09d2d45f53291cf
parent920bfc853e9f064c13e3e840452d38da43f0ab84
parent859a41082f5c3c998fc09f0effc3e3bf4e7eee9c
Merge branch 'hotfix/2.1.3'