Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2015 12:23:53 +0000 (13:23 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 22 Dec 2015 12:23:53 +0000 (13:23 +0100)
commit2842214dfd9c6d5aad960ef54c724b1ad294eff3
treedf81287df9228e45ee504b5656801703441f04f3
parentc07ba47537945be9bc5ff1a1946fbadb4fe0ee7d
parent48e5f94eec2aabdd1fbd4c20ed06017c14fcccbf
Merge branch 'next' into next-lantia