From: Justin Wind <justin.wind@gmail.com>
Date: Fri, 22 Feb 2013 02:36:37 +0000 (-0800)
Subject: Merge branch 'release/release-1.2'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=9b5d13ce510e4668d165c0b5ede7fd7f74adcbfc;hp=-c;p=reservoir_sample

Merge branch 'release/release-1.2'

General cleanup, plus support USR1 status reporting.
---

9b5d13ce510e4668d165c0b5ede7fd7f74adcbfc