Merge tag 'v1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:20 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:20 +0000 (12:09 -0400)
commitbe6f157681bc5fd20d33a767c6a020572c1b2e2d
treed3ab78e42068055b5c33d9647a0357e5d307c533
parentf11a796faef2dd2aa31951f8210b92e51f009388
parent9f62e6357481323bcbfafc10b67730ad0440502f
Merge tag 'v1.4' into develop

v1.4