Merge branch 'release/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:13:58 +0000 (11:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:13:58 +0000 (11:13 -0400)
commit037a1bfbf3ccf4dc456b7fef949ccb9aebc70cf1
tree7739b2ff7c64454f673024f20e8e3faa47664998
parentf5f3311483959e0a880afb8d53d6d46b66fb7aa9
parent1c062366497479fd9f04335a81fc83d1ee19bfb7
Merge branch 'release/1.0.6'