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

[Peter Lemenkov]

commit 1cdb4880a040fa7fc2f184762afb43960ce7f7e2
Merge: f24c78f 1444df1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Sep 10 14:18:04 2013 +0400

    Merge branch 'master' into f20
    
    Conflicts:
    	wireshark.spec

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 wireshark-0001-enable-Lua-support.patch            |   25 +
 ...rk-0002-Customize-permission-denied-error.patch |   33 +-
 ...Load-correct-shared-object-name-in-python.patch |   28 +
 wireshark-0004-fix-documentation-build-error.patch |   31 +
 ...05-fix-string-overrun-in-plugins-profinet.patch |   25 +
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |  899 ++++++++++++++++++++
 ...ercap.pod-unterminated-list-s-at-head-in-.patch |   27 +
 wireshark-1.2.4-enable_lua.patch                   |   13 -
 wireshark-1.2.8-disable_warning_dialog.patch       |   34 -
 wireshark-1.6.0-soname.patch                       |   17 -
 wireshark-1.8.x-flow-graph-crash.patch             |   42 -
 wireshark-1.8.x-pod2man-encoding.patch             |   27 -
 wireshark-libtool-pie.patch                        |   11 -
 wireshark-nfsv41-cleanup.patch                     |  124 ---
 wireshark.spec                                     |  110 ++--
 wiresharkdoc-24x24.png                             |  Bin 1281 -> 0 bytes
 18 files changed, 1115 insertions(+), 334 deletions(-)
---