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

[Peter Lemenkov]

commit 76c4190f1edc55978151e394ac444c48ee49af0e
Merge: b20d95b b47624d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Jan 29 17:28:22 2014 +0400

    Merge branch 'master' into f20

 ...024-Fix-paths-in-a-wireshark.desktop-file.patch |   20 ++++++++++++++++++++
 wireshark.spec                                     |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---