Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:43:03 +0000 (13:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:43:03 +0000 (13:43 -0400)
commitf11da9ef63eedf71cf7105f22a2670c7a6823623
treea2e2bd0c730020a2900b0707e6eb6374bbf9d6cd
parent47cc272ab2c46558f98f04ce8326732cd80dea40
parent20794d9978d6cd89a64021ba489177cb9347a6f2
Merge tag 'v1.2.2' into develop

v1.2.2