[springlobby/f13/master] (10 commits) ...resolve merge conflict

[Aurelien Bompard]

Summary of changes:

  347b2df... - version 0.63 (*)
  af2fcbd... Forgot to commit new sources (*)
  4485d62... - version 0.78 (*)
  7d38398... - version 0.79 - add patch to fix DSO linking     (http://f (*)
  b88b222... - version 0.79 - add patch to fix DSO linking     (http://f (*)
  50d8761... - version 0.80 (*)
  d9350ec... - rebuilt against wxGTK-2.8.11-2 (*)
  fc004f0... dist-git conversion (*)
  f4151ec... version 0.95 (*)
  f6fd274... resolve merge conflict

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