Merge remote-tracking branch 'upstream/beta' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 18 Nov 2015 12:19:51 +0000 (13:19 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 18 Nov 2015 12:19:51 +0000 (13:19 +0100)
commit87db47a9004f1fe55032793069b498c6c5dc2e93
tree29d4d17f21132225fc1ef2aff8cd9ea7ce46f570
parent1f198fec2372291113f6a7b1ed71aeae959cac38
parentcdeb9e0fcea3dfe8b952ee3e7f48dddbecd6403a
Merge remote-tracking branch 'upstream/beta' into beta