Merge branch 'release/release-1.2'
authorJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:36:37 +0000 (18:36 -0800)
committerJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:36:37 +0000 (18:36 -0800)
commit9b5d13ce510e4668d165c0b5ede7fd7f74adcbfc
tree85193a01d0f007654a1377ba17b3f6facfe43cc4
parentc294f0883b05016744fcbfc83241bbb5133a2cb9
parent74d72bd7756cdb09dbbb403dfc6b390f17c2ef17
Merge branch 'release/release-1.2'

General cleanup, plus support USR1 status reporting.