Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Mon, 26 Aug 2013 22:16:13 +0000 (15:16 -0700)
committerAllan Zhou <allanzp@gmail.com>
Mon, 26 Aug 2013 22:16:13 +0000 (15:16 -0700)

Trivial merge