Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Fri, 23 Aug 2013 00:02:41 +0000 (17:02 -0700)
committerAllan Zhou <allanzp@gmail.com>
Fri, 23 Aug 2013 00:02:41 +0000 (17:02 -0700)
commit614d9c19c14973122cf900df34ca2f6138b05b43
treed002a5c8aa794ddf947f0a024def5ec9b31d3cb8
parentb4e60dac233c791e53281bea4014354b8280421e
parent74e6672beb23ca372a06431ad17a9d79cda6382e
Merge remote-tracking branch 'upstream/master'