Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Tue, 24 Nov 2015 20:49:42 +0000 (21:49 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 24 Nov 2015 20:49:42 +0000 (21:49 +0100)
commitf094fbe2985e5d472ff957e5972a0b66efc6de35
tree9f61e5a1e1ac5d7c023bc085a9a9482a04490de3
parentc21ba1dd9c0b876f7a5425c78b57b1614cebbede
parent80573594d4f816f52cf4ab90537a93e256d772be
Merge branch 'next' into next-lantia