Sun, 17 Jan 2016 22:02:44 -0800 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 17 Jan 2016 22:02:44 -0800] rev 1586
merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip