cm-11-20131130.2324-SKANKY
cm-11-20131201.1543-SKANKY
cm-11-20131202.1139-SKANKY
Merge branch 'master' of github.com:k940284/CM11-SKANKY

Conflicts:
	DeskClock/res/values-ko/strings.xml
	Settings/res/values-ko/strings.xml
	version.txt