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

[Peter Lemenkov]

commit d2a6468fb38d17ed12ffec1dbba8d28e10a9dfa3
Merge: 80e0853 65d033b
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Nov 27 16:28:09 2013 +0400

    Merge branch 'master' into f20

 wireshark-0001-enable-Lua-support.patch            |    1 -
 ...rk-0002-Customize-permission-denied-error.patch |    1 -
 ...Load-correct-shared-object-name-in-python.patch |    1 -
 wireshark-0004-fix-documentation-build-error.patch |    1 -
 ...05-fix-string-overrun-in-plugins-profinet.patch |    1 -
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |  491 +++++++++++++++++++-
 ...07-The-beginning-of-an-openflow-dissector.patch |    1 -
 wireshark-0008-adds-autoconf-macro-file.patch      |    1 -
 ...shark-0009-Restore-Fedora-specific-groups.patch |    1 -
 wireshark-0010-Add-pkgconfig-entry.patch           |    1 -
 wireshark-0011-Install-autoconf-related-file.patch |    1 -
 ...ve-default-temporary-directory-to-var-tmp.patch |    1 -
 wireshark-0013-Copy-over-r49999-from-trunk.patch   |   60 +++
 ...itial-version-of-RT-C-P-dissector-hinting.patch |  129 -----
 ...ugs.wireshark.org-bugzilla-show_bug.cgi-i.patch |   22 +
 ...shark-0015-Add-expert-info-about-timeouts.patch |   84 ++++
 wireshark.spec                                     |   20 +-
 17 files changed, 648 insertions(+), 169 deletions(-)
---