Merge branch 'hotfix/1.0.2'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 18:06:30 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 Feb 2016 18:06:30 +0000 (13:06 -0500)
commitf91a2dc1ab84ac8e6300e74da6e0db4e94ed0c56
tree34a707a7f09217dfe705127ad6ee2bcbe9a18a1d
parent775e0732cba1b08cb64a22d4d81127f673d660bb
parent44de537009f94ba265e72647f77bca21b733f43c
Merge branch 'hotfix/1.0.2'