Merge branch 'v0.6.18-release' into v0.6
authorisaacs <i@izs.me>
Tue, 15 May 2012 17:21:40 +0000 (10:21 -0700)
committerisaacs <i@izs.me>
Tue, 15 May 2012 17:21:40 +0000 (10:21 -0700)
commit2498d15dde5973c647d1496d52dd915fbc500f3b
tree6abff72b8b5cc7fa246f46963f87761280bb5acc
parent8068f9bf3883bcf2768d47fe885961a0223e0c45
parent4bc1d395de6abed2cf1e4d0b7b3a1480a21c368f
Merge branch 'v0.6.18-release' into v0.6