Vdragon/git-cola — pull request #1 by Vdragon (2014-08-11 04:26:12+00:00)
Title: Merge upstream changes

Signed-by: Ｖ字龍(Vdragon)