Merge pull request #2895 from verybadsoldier/master

author Memphiz <memphis@machzwo.de>

Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)

committer Memphiz <memphis@machzwo.de>

Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)
author Memphiz <memphis@machzwo.de>
Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)
committer Memphiz <memphis@machzwo.de>
Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)
diff --cc xbmc/Application.cpp
Simple merge
diff --cc xbmc/Application.h
Simple merge
diff --cc xbmc/powermanagement/PowerManager.cpp
Simple merge
author	Memphiz <memphis@machzwo.de>
	Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)
committer	Memphiz <memphis@machzwo.de>
	Wed, 7 Aug 2013 08:39:15 +0000 (01:39 -0700)
		1	2
xbmc/Application.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/Application.h	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/powermanagement/PowerManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history