Merge remote-tracking branch 'upstream/beta' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 19:10:21 +0000 (20:10 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 19:10:21 +0000 (20:10 +0100)
commitc43335f474f302dffbf17675904e83675967c196
treeefb123cd572e1e46d29ba1bb50b06569db69252a
parent88d7695daf868651ca1f5ebec8ad93d51170c5e3
parent01115a1cd50362a22924845ddc72c74467ad5d10
Merge remote-tracking branch 'upstream/beta' into beta