Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 13 Aug 2015 06:02:48 +0000 (08:02 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 13 Aug 2015 06:02:48 +0000 (08:02 +0200)
commit0eec4f8b9e561a8e25e2fe61449e178613ebe830
treec3d9d0faaf6d638f11d0ba66195f4a2239165d10
parent5c775bb3350dfa19f54edad8fb2051bed9ea61ab
parentbf0e6badd2aa996824e5f4703a413751c3f75950
Merge branch 'master' into next