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)
commitae6b686775ea4a16a1d756bcacec393dcd76d1da
tree6cf82bc2ead956c5d41a2d18f774ba0db1bb8c57
parent13758253ca8f1acd8974e7bd0d25c9cf1f338060
parente901b609baa4dd5f681e2a5257c9e504997e3377
Merge remote-tracking branch 'upstream/develop' into fileCount
res/values/strings.xml