Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Sun, 12 Feb 2012 12:32:56 +0000 (13:32 +0100)
committerAndy Wingo <wingo@pobox.com>
Sun, 12 Feb 2012 12:32:56 +0000 (13:32 +0100)
commit12087939ed06cafa3c6467ff1462d80880f4d86b
tree05fa2416b0e1dca6c282026dca8d37d5c4e5a88e
parente4c785f5df307d7119af8ec28160faf479ffcda0
parent164a78b355908d2149ef1ef266bec26d56b73365
Merge remote-tracking branch 'origin/stable-2.0'