Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Wed, 23 Jan 2013 15:19:16 +0000 (16:19 +0100)
committerAndy Wingo <wingo@pobox.com>
Wed, 23 Jan 2013 15:19:16 +0000 (16:19 +0100)
commit5da51ad78d08c71083b70e6a9205ce937f5438ba
treed8265f24da117967b4a539ff3b4127a014ebff0f
parent0683c24d323a30de0a44ec754a85af88a48586ea
parenta20eb9a39be78909b3447aebee9a326de5042d19
Merge remote-tracking branch 'origin/stable-2.0'