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

[Peter Lemenkov]

commit c95a86d5645c894e00e82666c879053b9e2690f4
Merge: 85363f0 844b610
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Sep 11 15:10:08 2013 +0400

    Merge branch 'master' into f19

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 wireshark-0001-enable-Lua-support.patch            |    4 +-
 ...rk-0002-Customize-permission-denied-error.patch |    6 ++--
 ...Load-correct-shared-object-name-in-python.patch |    4 +-
 wireshark-0004-fix-documentation-build-error.patch |    4 +-
 ...05-fix-string-overrun-in-plugins-profinet.patch |    4 +-
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |   19 ++++++--------
 ...ercap.pod-unterminated-list-s-at-head-in-.patch |   27 --------------------
 wireshark.console                                  |    4 ---
 wireshark.spec                                     |   10 +++---
 11 files changed, 26 insertions(+), 59 deletions(-)
---