Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:37:14 +0000 (13:37 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:37:14 +0000 (13:37 -0500)
commitd3c5b89b3c0208110dc12ffb4c0ceb3162970c5f
treec1a9ee3ba8ffd3fa5955f74bd9f265a987136cb0
parentbfbd0d4a4104377b11ac9a616c7a4feda517ead0
parenta9cfbce4412f9b68e1b40bbf1d4e706a0dcbad66
Merge branch 'hotfix/1.1.3'