Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Wed, 23 Dec 2015 08:32:00 +0000 (09:32 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 23 Dec 2015 08:32:00 +0000 (09:32 +0100)
commit4a91e574e22edad4ca64f75dff56bc747778ce39
tree9a3935563cc4da8281a2325e633b8e4c52049a87
parent81232a7fda16655b6e234b42749aa2f73b09ffef
parent76f12d13a1fa1f21aa83f71619e9f9fff61324a7
Merge branch 'next' into next-lantia