[wireshark/f20: 2/2] Merge branch 'master' into f20

[Peter Lemenkov]

commit 6a59cd9f8464948698b4e40f971289cdc1e7a305
Merge: d2a6468 61af307
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Dec 8 13:32:18 2013 +0400

    Merge branch 'master' into f20

 ...Load-correct-shared-object-name-in-python.patch |    4 +-
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |   80 +++++-
 ...shark-0015-Add-expert-info-about-timeouts.patch |   84 ------
 ...Jagdmann-Make-sure-err_str-is-initialized.patch |   19 ++
 ...selecting-Decode-As-based-on-SCTP-PPID.-B.patch |   32 +++
 ...ugs.wireshark.org-bugzilla-show_bug.cgi-i.patch |  295 ++++++++++++++++++++
 wireshark.spec                                     |   31 ++-
 7 files changed, 444 insertions(+), 101 deletions(-)
---