Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:17:38 +0000 (15:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:17:38 +0000 (15:17 -0400)
commitefbe86aa273eb031188f60a2ea3f191c08935133
treefbd7a87faddc69cb8d3e326bb77d0e3b3d1314ac
parent920709334aebe639741649144ef52f270000228a
parent6f6fb643918732edb85a4f0a328e79c333ef40b1
Merge branch 'hotfix/1.1.3'