Merge remote branch 'upstream/master'

author Lars Op den Kamp <lars@opdenkamp.eu>

Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)

committer Lars Op den Kamp <lars@opdenkamp.eu>

Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
author Lars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
committer Lars Op den Kamp <lars@opdenkamp.eu>
Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
diff --cc .gitignore
Simple merge
diff --cc addons/skin.confluence/720p/Home.xml
Simple merge
diff --cc addons/skin.confluence/720p/custom_SkinSetting_1111.xml
Simple merge
diff --cc addons/skin.confluence/language/English/strings.xml
Simple merge
diff --cc addons/skin.confluence/language/German/strings.xml
Simple merge
diff --cc xbmc/utils/GUIInfoManager.cpp
Simple merge
diff --cc xbmc/utils/GUIInfoManager.h
Simple merge
author	Lars Op den Kamp <lars@opdenkamp.eu>
	Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
committer	Lars Op den Kamp <lars@opdenkamp.eu>
	Sat, 8 Jan 2011 16:34:09 +0000 (17:34 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
addons/skin.confluence/720p/Home.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/skin.confluence/720p/custom_SkinSetting_1111.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/skin.confluence/language/English/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/skin.confluence/language/German/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/utils/GUIInfoManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/utils/GUIInfoManager.h	patch \|	diff1 \|	diff2 \|	blob \| history