# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1389143016 28800
# Node ID 57874b249940b5601b30684bfdcf3aa56ed10f37
# Parent  0ff862dcddbdea5b1bd3cd5da0f64688883206c0# Parent  6b10897dcba74680cb3050db62bc2de93c69a126
merge stable back into default