Merge branch 'js/misc-git-gui-stuff' of ../git-gui