Merge remote-tracking branch 'upstream/develop' into fileCount
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:59:51 +0000 (17:59 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:59:51 +0000 (17:59 +0100)
1  2 
res/values/strings.xml

Simple merge