Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:49:03 +0000 (17:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:49:03 +0000 (17:49 +0100)
commitf707da7cce6e1ad2532cbef720cf28ff3bd39032
tree464ccc410c797ce5da576975868fe84666e73ddc
parentaf2841eea2eb1240e6b6b95eab797d0cc24fcaa5
parent8331456825b5bc48f1566ba109b9a9504f67991c
Merge remote-tracking branch 'remotes/upstream/master' into beta
res/values-pt-rBR/strings.xml