Merge remote branch 'UPSTREAM/master'
authorVictor Lowther <victor.lowther@gmail.com>
Sat, 19 Jun 2010 23:32:02 +0000 (18:32 -0500)
committerVictor Lowther <victor.lowther@gmail.com>
Sat, 19 Jun 2010 23:32:02 +0000 (18:32 -0500)
commit48bf23b6f42f1a09dbfcf536430c34bb2c20d1de
treee6dd7a29d1dec12b165a983c2d38c713ffb2f317
parent1b49344423b6155ca2c62a0a9536fe8b5d26c53c
parentf00a46815baea497add444525210d3d5a3547b1b
Merge remote branch 'UPSTREAM/master'