[pan2] (20 commits) Created branch merge_testing_master

[Heinrich MÃller <henmull src gnome org>]

The branch 'merge_testing_master' was created.

Summary of new commits:

  3d32275... * fixed bug in flags not saving to headers * fixed glib ver (*)
  bc78035... * fixed last bug in flags not saving to headers (*)
  443739c... Updated Spanish translation (*)
  d1133d9... [l10n] Updated German translation (*)
  4f343fb... Updated Slovenian translation (*)
  37631e6... further improve on flags : mark all flagged (*)
  e8a7ead... fixed stupid ngettext bug (*)
  86d1e43... Updated German translation (*)
  cb593ad... Fix : Click on Body Pane header info row expands/hides head (*)
  aac97b2... * https://bugzilla.gnome.org/show_bug.cgi?id=527688 * clean (*)
  3db6701... oops (*)
  6c94923... switched charset preferences from global/local to local/glo (*)
  63ae541... Updated Slovenian translation (*)
  81d9e4e... https://bugzilla.gnome.org/show_bug.cgi?id=412890 (*)
  bfbb511... * a few fixes to iconv * https://bugzilla.gnome.org/show_bu (*)
  c07626c... iconv fix (*)
  6c08458... Dumped OpenSSL, implemented GnuTLS
  4c64147... added ability to import from SSL_CERT_DIR (has to be export
  e1e087c... Merge branch 'master' into test2
  ddf7043... a few gnutls fixes

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