Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 28 Nov 2015 08:49:09 +0000 (09:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 28 Nov 2015 08:49:09 +0000 (09:49 +0100)
commita92bfac47912d3639f7ef55015565f8e99b99407
tree27eff123a38fa9e86bd9d1af479013828977a080
parentb29ba035f8fa516b74d814d831a5928a8ab795de
parent248aaf4bf01603296fa669f9eede6ca9ca4febc6
Merge remote-tracking branch 'remotes/upstream/master' into beta
res/values-de-rDE/strings.xml