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

[Peter Lemenkov]

commit ac1957dbd92f06a26927a88dd78d8507b478e50b
Merge: 179b816 b47624d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Jan 29 17:35:57 2014 +0400

    Merge branch 'master' into f19

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