Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:49:28 +0000 (17:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:49:28 +0000 (17:49 +0100)
commitb277d52ab693c57d2f74c2063e8b3f6afa36c356
tree6fababd290ac88a4f512ed9c1faa2b42f6093d2d
parent8187a6e5126867cc859113aeb1677f3dcd9ef96b
parentce4a8bc47743c2c388c7cf6d1c676bbb75a0af2b
Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta