Merge branch 'eddiehung-vtr'
authorClifford Wolf <clifford@clifford.at>
Fri, 8 Jul 2016 09:56:53 +0000 (11:56 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 8 Jul 2016 09:56:53 +0000 (11:56 +0200)
commitb782076698b76445b6b1087671687483c6d6c545
tree2639232409c190a864a965af72ac2f9d7a6b8d9e
parente420412043228cec6a15b356cc9eea82bbafe9c0
parent27b5347a871d209ec4cba094e1203cc896c9c4b3
Merge branch 'eddiehung-vtr'