Merge branch 'hotfix/0.1.2' v0.1.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 May 2015 15:46:06 +0000 (11:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 May 2015 15:46:06 +0000 (11:46 -0400)

Trivial merge