[gitg] (7 commits) Non-fast-forward update to branch wip/libmerge

[Ignacio Casal Quinteiro <icq src gnome org>]

The branch 'wip/libmerge' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 http://live.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  2725c09... Move files from libgitg-gtk to libgitg
  29e7bcf... Do not link with itself

Commits added to the branch:

  fc82b5e... Fix typo (*)
  b1463f4... Update to jquery 1.10.1 (*)
  c1992f3... Make dash view inherit from ListBox (*)
  be0dced... Remove viewport around DashView (*)
  be34138... dash view: set style directly on ui file now that we can (*)
  a015b61... Move files from libgitg-gtk to libgitg
  160aae4... Do not link with itself

(*) This commit already existed in another branch; no separate mail sent