Merge branch 'hotfix/1.1.5' v1.0.19 v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)
commit8aa5fd172c6653f7441beff4aa52cccc8d755834
treebc9531a20152910afb77444df7f5ce235141d68a
parent92c81aa58c5ad9bf2a34bdda346294fcb9e9d4d3
parentf547ec95718c2d67d6651154b4bac8ec6ab6a94f
Merge branch 'hotfix/1.1.5'