Merge branch 'stv0g-master'
authorClifford Wolf <clifford@clifford.at>
Sat, 11 Feb 2017 09:20:10 +0000 (10:20 +0100)
committerClifford Wolf <clifford@clifford.at>
Sat, 11 Feb 2017 09:20:10 +0000 (10:20 +0100)
commita431f4ee311b9563f546201d255e429e9ce58cfa
tree3e4e93d617b51f05fe4e18c98d4cdb108d96b38d
parenta5bfeb9e07e7d160c55c6223c203d6ec124911f0
parenta1a82d68f500604d6cb477456b89925e99171e76
Merge branch 'stv0g-master'