Merge remote-tracking branch 'origin/stable-2.0' into stable-2.0
authorAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 13:55:25 +0000 (15:55 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 13:55:25 +0000 (15:55 +0200)
commit7aa43cde6a73dedfb47e29cb0da495626bff6862
treed131add0f9fa2fdb27a961b54f518fc93871530d
parent67b699cc77d5e2f74daca77aa26b1ba8af0d0808
parent33672b071118f54ee637afa00349f2a4404a84da
Merge remote-tracking branch 'origin/stable-2.0' into stable-2.0