# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1401831075 25200
# Node ID 5e2c277625958b0f473de8176fd848a7b75b8a5d
# Parent  c768f7666106237c458b809f1fba7a00ae225672# Parent  b4fa7cc040d63e5c03a8226e1c6e970e3b8b793e
merge stable into default

default is meant to be a superset of stable