Merge remote-tracking branch 'upstream/master'

author Emmanuel Ledoux <eledoux@hp.com>

Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)

committer Emmanuel Ledoux <emmanuel.ledoux@hp.com>

Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
author Emmanuel Ledoux <eledoux@hp.com>
Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
committer Emmanuel Ledoux <emmanuel.ledoux@hp.com>
Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
diff --cc .gitignore
Simple merge
diff --cc client/common/cmdline.c
Simple merge
diff --cc include/freerdp/settings.h
Simple merge
diff --cc libfreerdp/common/settings.c
Simple merge
author	Emmanuel Ledoux <eledoux@hp.com>
	Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
committer	Emmanuel Ledoux <emmanuel.ledoux@hp.com>
	Thu, 3 Jul 2014 09:56:00 +0000 (11:56 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
client/common/cmdline.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/freerdp/settings.h	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp/common/settings.c	patch \|	diff1 \|	diff2 \|	blob \| history