Merge branch 'v0.6.17-release' into v0.6
authorisaacs <i@izs.me>
Fri, 4 May 2012 20:34:08 +0000 (13:34 -0700)
committerisaacs <i@izs.me>
Fri, 4 May 2012 20:34:08 +0000 (13:34 -0700)
commitfbe143d9cbfa9ba5d1e948cd04380b187178ce9d
tree1a296027fac21322c4a87b4a5087a460d9e1aac1
parentacf19500eed8805cd038e38c14d692f5684ea375
parent4ced23deaf36493f4303a18f6fdce768c58becc0
Merge branch 'v0.6.17-release' into v0.6