Merge branch 'release/1.0.9' v1.0.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 15:23:31 +0000 (11:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 15:23:31 +0000 (11:23 -0400)

Trivial merge