qipost/merge-and-rebase — pull request #12 by lawrenceqin (2012-07-08 04:16:59+00:00)
Title: Rebase pull rebase

Do a pull --rebase after rebasing on upstream