[open-vm-tools/f19: 4/4] Merge branch 'master' into f19

[Simone Caronni]

commit 2a05dfb8aecea10cfe8fd8aef1a87a14c7d72e16
Merge: acc4bac 3031fb5
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Jul 17 08:50:23 2014 +0200

    Merge branch 'master' into f19

 .gitignore            |    1 +
 open-vm-tools.spec    |   29 +++++++++++++++++++++++------
 sizeof_argument.patch |   12 ++++++++++++
 sources               |    2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)
---