Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed a typo.

Stuid Dansih.. Should be the last fix.
Fixed Russian localization
Merge remote-tracking branch 'upstream/master'
update spanish translation
Merge pull request #34 from TheHamster95/patch-1

Fixed a typo.
Merge pull request #36 from ed10vi/master

Update spanish translation
Merge pull request #35 from MrYadro/master

Err, one more time
Set noHistory on MainActivity to prevent a running instance of Superuser from regaining focus after a request is finished.

Change-Id: I3ea42bdd6b15006010e1beeea04cd540bf160428
fix recovery zip su location to be aosp standard. /system/bin/su symlinks to xbin/su

Change-Id: I64fe4538b6984daae069556daeaaf8097d9021e4
fix recovery zip su location to be aosp standard. /system/bin/su symlinks to xbin/su

Change-Id: Ie661812417db47a730172645f84f2a20e20398e6
Merge branch 'master' of git://github.com/koush/Superuser into jellybean