Merge branch 'hotfix/1.0.5'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:01 +0000 (15:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:01 +0000 (15:30 -0500)
commit472e7e75bd82661107bb85bddfd05d55c403457f
treeab402cfc87e555990064c95d44fb20e884a94ca3
parent44252453644ad18f2a1e7c5ba972c9c98c174df0
parente6d5c0ee2642bb57fda8a7016285d278d58141f4
Merge branch 'hotfix/1.0.5'