Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Sat, 31 Aug 2013 00:51:59 +0000 (17:51 -0700)
committerAllan Zhou <allanzp@gmail.com>
Sat, 31 Aug 2013 00:51:59 +0000 (17:51 -0700)

No differences found