Merge branch 'hotfix/1.2.2'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:26 +0000 (11:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:26 +0000 (11:57 -0500)
commit555cf7e93e2fac194e7147d63c283a287ed93d19
tree535142b7e0660af83a60f40c987ac9df89efc553
parentca856e3b8c1050f0aa5039476c3607e0677080c4
parentc98682804549ef2473142c86fe20f4c5e8ba6aed
Merge branch 'hotfix/1.2.2'