Anthony Restaino f4078cce33 Merge branch 'master' of https://github.com/anthonycr/Lightning-Browser
Conflicts:
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
2015-04-25 22:12:11 -04:00
..