commit | 0092336886684dfa437a5f21956a77008230d1a1 | [log] [tgz] |
---|---|---|
author | Sean Middleditch <sean@middleditch.us> | Sat Mar 21 00:30:56 2009 -0400 |
committer | Sean Middleditch <sean@middleditch.us> | Sat Mar 21 00:30:56 2009 -0400 |
tree | 7715e768a4543658ae427842d2c5804000a40bc8 | |
parent | 34bb0998c7f3a8d01d7d3c5e248cddf8547c4473 [diff] | |
parent | 1443ca494f6666fa793428b42d430428ad9f462b [diff] |
Merge branch 'master' into fix-negotiate