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

[Peter Lemenkov]

commit cfa4a42aca19c9de8559f5070c9b430e6d503c05
Merge: ac1957d 88032ff
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Mar 8 21:47:50 2014 +0400

    Merge branch 'master' into f19

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |    2 +-
 ...07-The-beginning-of-an-openflow-dissector.patch |    2 +-
 wireshark-0010-Add-pkgconfig-entry.patch           |    6 +-
 wireshark-0011-Install-autoconf-related-file.patch |    2 +-
 wireshark-0021-Remove-g_memmove.patch              |   35 ----
 wireshark-0025-Fix-Capture-Dialog-layout.patch     |  208 ++++++++++++++++++++
 wireshark.spec                                     |   25 ++-
 9 files changed, 235 insertions(+), 48 deletions(-)
---