Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 17 Nov 2015 19:01:14 +0000 (14:01 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 17 Nov 2015 19:01:14 +0000 (14:01 -0500)
commitd1f20ac0705c6ea16b0c47b0176277c4362f0aac
treeafe634cc0ba5792311627dd943f13e42b0529730
parent8d8d26fe5828b9e7bd491d9d8ca3b97a3ab05ffc
parent9fb56623f72ccc6dabc2ec471f0417186e5fe2a0
Merge branch 'master' into stable

Updating CFP deadline in the carousel to reflec the extension.