[pango/matthiasc/for-master] (11 commits) ...test-break: Make help output work again

[Matthias Clasen <matthiasc src gnome org>]

Summary of changes:

  1661f1b... layout: handle empty lines better (*)
  69441db... Merge branch 'fix-empty-line-spacing' into 'master' (*)
  71ad5cb... Merge branch 'matthiasc/for-master' into 'master' (*)
  10895f2... Make pango_layout_line_get_height work (*)
  c754c4d... Ensure ellipsized lines have the right width (*)
  2185eed... Merge branch 'fix-layout-line-height' into 'master' (*)
  8b1e9f9... Merge branch 'fix-ellipsized-line-width' into 'master' (*)
  7b3182a... Add some NULL checks (*)
  4e2bc45... Merge branch 'add-null-checkds' into 'master' (*)
  9d29bdf... fc: Don't use GTask for threading
  0fb7901... test-break: Make help output work again

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