Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Thu, 22 Aug 2013 17:43:51 +0000 (10:43 -0700)
committerAllan Zhou <allanzp@gmail.com>
Thu, 22 Aug 2013 17:43:51 +0000 (10:43 -0700)
commitb4e60dac233c791e53281bea4014354b8280421e
treebd3cc773a31942f7cbc6e2a918b052ebfea13133
parent5af7e056a746ad9d0dbfd82470fb216addaf9dbd
parent83390b83d9652042203abd91473e5c764908cbd9
Merge remote-tracking branch 'upstream/master'