Merge branch 'hotfix/1.2.1' v1.2.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:43 +0000 (13:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:43 +0000 (13:32 -0400)
commitbbe05c56e75981ea573b6a09c3541b1ee6b6ca77
tree8027e238aba0114c45bd1479091b57bcaf7037fa
parent867377a5e330ee9de2eb54b592322dcc59ad2ffb
parentac7b76853fc6417d7270dc0ca3927f1b4e9fdb98
Merge branch 'hotfix/1.2.1'