Merge branch 'release/1.4' v1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:14 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:14 +0000 (12:09 -0400)
commit9f62e6357481323bcbfafc10b67730ad0440502f
treed3ab78e42068055b5c33d9647a0357e5d307c533
parent72507216b4696d74ecc7fe6fdf0d87ed2408de0b
parentf11a796faef2dd2aa31951f8210b92e51f009388
Merge branch 'release/1.4'