Merge branch 'hotfix/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:04 +0000 (11:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:04 +0000 (11:18 -0400)
commitcefd19a0121f5f9042a7c0f5cdedd26a96b6e1f3
tree3291c6ee736e4c94730d5db6a6f868910e603816
parent037a1bfbf3ccf4dc456b7fef949ccb9aebc70cf1
parent466bfb1ec8a1a6a8baa6e809f9184a1386d4b26c
Merge branch 'hotfix/1.0.7'