Fri, 11 Dec 2015 13:12:23 -0500 Merge.
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 13:12:23 -0500] rev 1876
Merge.
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip