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

[Peter Lemenkov]

commit 917df6ff53b39f6e08440e850e667c1870729e20
Merge: bf95e4f 5579c45
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Sep 13 17:14:05 2013 +0400

    Merge branch 'master' into f20

 wireshark-0001-enable-Lua-support.patch            |    2 +-
 ...rk-0002-Customize-permission-denied-error.patch |    2 +-
 ...Load-correct-shared-object-name-in-python.patch |    2 +-
 wireshark-0004-fix-documentation-build-error.patch |    2 +-
 ...05-fix-string-overrun-in-plugins-profinet.patch |    2 +-
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |    2 +-
 ...07-The-beginning-of-an-openflow-dissector.patch |    2 +-
 wireshark-0008-adds-autoconf-macro-file.patch      |  121 ++++++++++
 ...shark-0009-Restore-Fedora-specific-groups.patch |   23 ++
 wireshark-0010-Add-pkgconfig-entry.patch           |   58 +++++
 wireshark-0011-Install-autoconf-related-file.patch |  244 ++++++++++++++++++++
 wireshark-autoconf.m4                              |  101 --------
 wireshark.spec                                     |   48 ++--
 13 files changed, 475 insertions(+), 134 deletions(-)
---