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

[Peter Lemenkov]

commit 54fb51d0b871923007e3f1f827464dc959465e2f
Merge: 1dde757 6533a78
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Sep 12 10:40:49 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 | 1523 ++++++++++++++++++++
 wireshark.spec                                     |   10 +-
 8 files changed, 1537 insertions(+), 8 deletions(-)
---